--#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 ++#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 msgid "Description" msgstr "" @@@ -1218,7 -1218,7 +1246,7 @@@ msgid " 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:484 apt.conf.5.xml:506 ++#: 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:491 apt.conf.5.xml:513 msgid "options" msgstr "" @@@ -1411,12 -1411,12 +1439,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 ++#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1426,7 -1426,7 +1454,7 @@@ msgid "&file-sourceslist; &file-stateli msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233 ++#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1436,7 -1436,7 +1464,7 @@@ msgid "&apt-conf;, &sources-list;, &apt msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 ++#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1535,7 -1535,7 +1563,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "" @@@ -1735,7 -1735,7 +1763,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@@ -2270,7 -2270,7 +2298,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to " ++"Sets the output Sources file. Defaults to " "<filename>$(DIST)/$(SECTION)/source/Sources</filename>" msgstr "" @@@ -2383,20 -2383,20 +2411,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section " --"<command>apt-ftparchive</command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section " ++"<command>apt-ftparchive</command> performs an operation similar to: " ++"<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2690,12 -2690,12 +2720,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2704,12 -2704,12 +2753,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@@ -2718,14 -2718,14 +2767,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2796,7 -2796,7 +2845,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "" @@@ -3124,15 -3124,15 +3173,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3389,7 -3389,7 +3438,7 @@@ msgstr " 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. <option>remove --purge</option> is equivalent for " ++"purged. <option>remove --purge</option> is equivalent to the " "<option>purge</option> command. Configuration Item: " "<literal>APT::Get::Purge</literal>." msgstr "" @@@ -3609,13 -3609,13 +3658,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " --"<arg " ++"<command>apt-key</command> <arg><option>--keyring " ++"<replaceable>filename</replaceable></option></arg> " ++"<arg><replaceable>command</replaceable></arg> <arg " "rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3623,17 -3623,17 +3673,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3641,116 -3641,116 +3691,134 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through " ++"<filename>trusted.gpg</filename> is the primary keyring which means that " ++"e.g. new keys are added to this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "" @@@ -4445,13 -4445,13 +4513,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a " "Pre-Dependency. So in theory it is possible that APT encounters a situation " --"in which it is unable to perform immediate configuration, error out and " ++"in which it is unable to perform immediate configuration, errors out and " "refers to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like " "<literal>dist-upgrade</literal> is run with this option disabled it should " @@@ -4552,13 -4552,13 +4620,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@@ -4568,36 -4568,36 +4647,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4609,7 -4609,7 +4688,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4623,7 -4623,7 +4702,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4631,7 -4631,7 +4710,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4643,7 -4643,7 +4722,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@@ -4653,7 -4653,7 +4732,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4661,12 -4661,12 +4740,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4676,7 -4676,7 +4755,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4698,12 -4698,12 +4777,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4723,7 -4723,7 +4802,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4733,7 -4733,7 +4812,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@@ -4743,7 -4743,7 +4822,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4753,18 -4753,18 +4832,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4777,12 -4777,12 +4856,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4790,12 -4790,12 +4869,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@@ -4803,7 -4803,7 +4882,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4815,19 -4815,19 +4894,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4844,13 -4844,13 +4923,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@@ -4865,7 -4865,7 +4944,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4875,17 -4875,17 +4954,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Description in 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 " @@@ -4893,18 -4893,18 +4972,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> --#: apt.conf.5.xml:413 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4913,7 -4913,7 +4992,7 @@@ "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 " ++"without actually use them if the environment doesn't specify 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 " @@@ -4930,12 -4930,12 +5009,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4947,7 -4947,7 +5026,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4960,7 -4960,7 +5039,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4970,7 -4970,7 +5049,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -4978,7 -4978,7 +5057,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@@ -4990,7 -4990,7 +5069,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -5003,12 -5003,12 +5082,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -5016,12 -5016,12 +5095,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5032,50 -5032,50 +5111,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5083,17 -5083,17 +5162,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5102,12 -5102,12 +5181,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5117,7 -5117,7 +5196,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5128,36 -5128,36 +5207,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5172,7 -5172,7 +5251,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5182,7 -5182,7 +5261,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5196,12 -5196,12 +5275,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5213,12 -5213,12 +5292,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5235,12 -5235,12 +5314,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@@ -5252,12 -5252,12 +5331,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5267,12 -5267,12 +5346,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@@ -5284,12 -5284,12 +5363,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5301,7 -5301,7 +5380,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5315,12 -5315,12 +5394,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5329,12 -5329,12 +5408,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5345,7 -5345,7 +5424,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@@ -5353,7 -5353,7 +5432,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@@ -5361,7 -5361,7 +5440,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5371,110 -5371,110 +5450,110 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5482,92 -5482,92 +5561,92 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@@ -5577,12 -5577,12 +5656,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@@ -5600,90 -5600,90 +5679,90 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5691,32 -5691,32 +5770,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@@ -6844,7 -6844,7 +6923,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -6853,8 -6853,8 +6932,8 @@@ msgid " "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme " "<literal>apt-transport-<replaceable>method</replaceable></literal>. The APT " --"team e.g. maintain also the <literal>apt-transport-https</literal> package " --"which provides access methods for https-URIs with features similiar to the " ++"team e.g. maintains also the <literal>apt-transport-https</literal> package " ++"which provides access methods for https-URIs with features similar to the " "http method, but other methods for using e.g. debtorrent are also available, " "see <citerefentry> " "<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> " @@@ -7075,7 -7075,7 +7154,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7224,11 -7224,11 +7303,11 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in " --"<prgn>dselect</prgn> and then choose the APT method. You will be prompted " --"for a set of Sources which are places to fetch archives from. These " --"can be remote Internet sites, local Debian mirrors or CDROMs. 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 <prgn>dselect</prgn> " ++"and then choose the APT method. You will be prompted for a set of " ++"Sources which are places to fetch archives from. These can be " ++"remote Internet sites, local Debian mirrors or CDROMs. 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 CDROM 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 " @@@ -7313,7 -7313,7 +7392,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -7793,7 -7793,7 +7872,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -7892,7 -7892,7 +7971,7 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy " "/var/lib/dpkg/status to it. You will also need to create the " "directories outlined in the Overview, archives/partial/ and " --"lists/partial/ Then take the disc to the remote machine and " ++"lists/partial/. Then take the disc to the remote machine and " "configure the sources.list. On the remote machine execute the following:" msgstr "" @@@ -7910,9 -7910,9 +7989,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" diff --cc doc/po/es.po index 65456e495,ed7ca3d8f..c44bb7853 --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -14,7 -14,7 +14,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2004-09-20 17:05+0000\n" "Last-Translator: RubÃ©n Porras Campo <nahoo@inicia.es>\n" "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" @@@ -789,7 -789,7 +789,7 @@@ msgstr " "Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>." #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, fuzzy, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -811,6 -811,6 +811,53 @@@ msgstr " "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" "Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial)." ++#. type: Plain text ++#: apt.ent:362 ++#, fuzzy, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" ++"Directorio donde se almacena la informaciÃ³n del estado de cada paquete fuente por cada sitio especificado &sources-list; OpciÃ³n de configuraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" ++"Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" ++"Directorio donde se almacena la informaciÃ³n del estado de cada paquete fuente por cada sitio especificado &sources-list; OpciÃ³n de configuraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" ++"Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" ++"Directorio donde se almacena la informaciÃ³n del estado de cada paquete fuente por cada sitio especificado &sources-list; OpciÃ³n de configuraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" ++"Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>." ++ ++#. type: Plain text ++#: apt.ent:368 ++#, fuzzy, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (lo que implica que no estarÃ¡n completos).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (lo que implica que no estarÃ¡n completos).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (lo que implica que no estarÃ¡n completos).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial)." ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -903,7 -903,7 +950,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 #, fuzzy @@@ -1494,7 -1494,7 +1541,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 #, fuzzy msgid "options" msgstr "Opciones" @@@ -1759,7 -1759,7 +1806,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 #, fuzzy msgid "&apt-commonoptions;" @@@ -1769,8 -1769,8 +1816,8 @@@ msgstr " " " #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 #, fuzzy msgid "Files" msgstr "Ficheros" @@@ -1782,9 -1782,9 +1829,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@@ -1831,7 -1831,7 +1878,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 #, fuzzy msgid "Diagnostics" @@@ -1975,7 -1975,7 +2022,7 @@@ msgstr " "option> una de las siguientes Ã³rdenes deben de estar presentes." #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 #, fuzzy msgid "Options" msgstr "Opciones" @@@ -2257,7 -2257,7 +2304,7 @@@ msgid "Just show the contents of the co msgstr "SÃ³lo muestra el contenido del espacio de configuraciÃ³n." #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@@ -2821,7 -2821,7 +2868,7 @@@ msgstr "Source-Symlinks #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2936,20 -2936,20 +2983,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -3270,12 -3270,12 +3319,32 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 #, fuzzy --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++#, fuzzy ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "<option>--all-versions</option>" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -3284,27 -3284,27 +3353,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 #, fuzzy msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " @@@ -3386,7 -3386,7 +3455,7 @@@ msgstr " "dselect(8), aptitude, synaptic, gnome-apt and wajig." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 #, fuzzy msgid "update" msgstr "update" @@@ -3872,15 -3872,15 +3941,15 @@@ msgstr "<option>--fix-broken</option> 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" "Intenta arreglar un sistema con dependencias actualmente rotas. Esta opciÃ³n " "usada conjuntamente con install/remove, puede omitir cualquier paquete para " @@@ -4246,7 -4246,7 +4315,7 @@@ msgstr "<option>--purge</option> 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" "Borra los archivos de configuraciÃ³n de todos los paquetes que sean " @@@ -4540,14 -4540,14 +4609,25 @@@ msgstr "utilidad APT para administraciÃ #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 ++#, fuzzy msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" ++"<cmdsynopsis sepchar=\" \">\n" ++"<command>apt-cdrom</command>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvrmfan</option></arg>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-d=<replaceable>cdrom " ++"punto_de_montaje</replaceable></option></arg>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de " ++"configuraciÃ³n</replaceable></option></arg>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</" ++"replaceable></option></arg>" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -4555,18 -4555,18 +4635,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 #, fuzzy msgid "add <replaceable>filename</replaceable>" msgstr "add <replaceable>fichero(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -4574,123 -4574,123 +4654,141 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 #, fuzzy msgid "del <replaceable>keyid</replaceable>" msgstr "add <replaceable>fichero(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 #, fuzzy msgid "export <replaceable>keyid</replaceable>" msgstr "dotty <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 #, fuzzy msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "dotty <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 #, fuzzy msgid "adv" msgstr "add" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 #, fuzzy --msgid "<filename>/etc/apt/trusted.gpg</filename>" --msgstr "<filename>/etc/apt/apt.conf</filename>" ++msgid "--keyring <replaceable>filename</replaceable>" ++msgstr "add <replaceable>fichero(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 #, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/apt.conf</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 #, fuzzy msgid "&apt-get;, &apt-secure;" msgstr "&apt-conf;, &apt-get;, &sources-list;" @@@ -5488,13 -5488,13 +5586,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -5624,14 -5624,14 +5722,25 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 #, fuzzy msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 #, fuzzy msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" @@@ -5647,13 -5647,13 +5756,13 @@@ msgstr " "serÃ¡ abierta una conexiÃ³n por cada tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 #, fuzzy msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 #, fuzzy msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " @@@ -5663,13 -5663,13 +5772,13 @@@ msgstr " "los ficheros fallidos el nÃºmero de veces dado." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 #, fuzzy msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 #, fuzzy msgid "" "Use symlinks for source archives. If set to true then source archives will " @@@ -5679,13 -5679,13 +5788,13 @@@ msgstr " "fuente se enlazarÃ¡n a ser posible, en vez de copiarse. Por omisiÃ³n es true." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 #, fuzzy msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 #, fuzzy msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@@ -5703,7 -5703,7 +5812,7 @@@ msgstr " "de entorno <envar>http_proxy</envar> modifica todas las preferencias." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 #, fuzzy msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " @@@ -5728,7 -5728,7 +5837,7 @@@ msgstr " "Nota: Squid 2.0.2 no soporta ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 #, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " @@@ -5740,7 -5740,7 +5849,7 @@@ msgstr " "realizar la conexiÃ³n y para recibir datos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 #, fuzzy msgid "" "One setting is provided to control the pipeline depth in cases where the " @@@ -5760,7 -5760,7 +5869,7 @@@ msgstr " "necesiten esto violan el RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -5770,7 -5770,7 +5879,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -5778,13 -5778,13 +5887,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 #, fuzzy msgid "https" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -5794,7 -5794,7 +5903,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -5815,13 -5815,13 +5924,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 #, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 #, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " @@@ -5853,7 -5853,7 +5962,7 @@@ msgstr " "de la URI correspondiente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 #, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " @@@ -5870,7 -5870,7 +5979,7 @@@ msgstr " "fichero de configuraciÃ³n de muestra para ver ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 #, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" @@@ -5885,7 -5885,7 +5994,7 @@@ msgstr " "eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 #, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " @@@ -5901,19 -5901,19 +6010,19 @@@ msgstr " "la mayorÃa de los servidores FTP no soportan RFC2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 #, fuzzy msgid "cdrom" msgstr "apt-cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 #, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " @@@ -5933,12 -5933,12 +6042,12 @@@ msgstr " "antiguas). Respecto a la sintaxis se pone" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -5946,18 -5946,18 +6055,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -5969,19 -5969,19 +6078,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -5998,13 -5998,13 +6107,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6019,7 -6019,7 +6128,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -6029,36 -6029,36 +6138,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -6067,7 -6067,7 +6176,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -6086,13 -6086,13 +6195,13 @@@ msgstr " "paquetes y los manejadores de URI." #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 #, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 #, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " @@@ -6113,7 -6113,7 +6222,7 @@@ msgstr " "filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 #, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " @@@ -6135,7 -6135,7 +6244,7 @@@ msgstr " "literal> el directorio predeterminado estÃ¡ en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 #, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " @@@ -6152,7 -6152,7 +6261,7 @@@ msgstr " "envar>)." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 #, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " @@@ -6164,7 -6164,7 +6273,7 @@@ msgstr " "esto se carga el fichero principal de configuraciÃ³n." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 #, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" @@@ -6182,7 -6182,7 +6291,7 @@@ msgstr " "respectivos programas." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6195,13 -6195,13 +6304,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 #, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 #, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " @@@ -6213,13 -6213,13 +6322,13 @@@ msgstr " "la secciÃ³n <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 #, fuzzy msgid "Clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 #, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " @@@ -6237,7 -6237,7 +6346,7 @@@ msgstr " "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@@ -6247,13 -6247,13 +6356,13 @@@ msgstr " "ordenes cuando se ejecuta en la fase de instalaciÃ³n." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 #, fuzzy msgid "Updateoptions" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@@ -6263,13 -6263,13 +6372,13 @@@ msgstr " "ordenes cuando se ejecuta en la fase de actualizaciÃ³n." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 #, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 #, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " @@@ -6279,13 -6279,13 +6388,13 @@@ msgstr " "continuar. Por omisiÃ³n sÃ³lo pregunta en caso de error." #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 #, fuzzy msgid "How APT calls dpkg" msgstr "Como APT llama a dpkg" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 #, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " @@@ -6295,7 -6295,7 +6404,7 @@@ msgstr " "encuentran en la secciÃ³n <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 #, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " @@@ -6307,19 -6307,19 +6416,19 @@@ msgstr " "como un sÃ³lo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 #, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 #, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 #, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " @@@ -6333,13 -6333,13 +6442,13 @@@ msgstr " "si alguna falla APT abortarÃ¡." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 #, fuzzy msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 #, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " @@@ -6355,7 -6355,7 +6464,7 @@@ msgstr " "todos los .deb que va ha instalar por la entrada estÃ¡ndar, uno por lÃnea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 #, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " @@@ -6371,13 -6371,13 +6480,13 @@@ msgstr " "dada a <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 #, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 #, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" @@@ -6387,13 -6387,13 +6496,13 @@@ msgstr " "omisiÃ³n es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 #, fuzzy msgid "Build-options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 #, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " @@@ -6404,12 -6404,12 +6513,12 @@@ msgstr " "binarios." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -6424,7 -6424,7 +6533,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -6434,7 -6434,7 +6543,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -6448,12 -6448,12 +6557,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -6465,12 -6465,12 +6574,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -6486,12 -6486,12 +6595,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -6502,12 -6502,12 +6611,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -6517,12 -6517,12 +6626,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -6534,12 -6534,12 +6643,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -6551,7 -6551,7 +6660,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -6565,12 -6565,12 +6674,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -6579,13 -6579,13 +6688,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 #, fuzzy msgid "Debug options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -6596,7 -6596,7 +6705,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -6604,7 -6604,7 +6713,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -6612,7 -6612,7 +6721,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -6622,120 -6622,120 +6731,120 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "La lÃnea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -6743,99 -6743,99 +6852,99 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "La lÃnea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -6845,12 -6845,12 +6954,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -6867,96 -6867,96 +6976,96 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "La lÃnea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "La lÃnea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "La lÃnea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "La lÃnea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -6964,20 -6964,20 +7073,20 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "La lÃnea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@@ -6987,14 -6987,14 +7096,14 @@@ msgstr " "los valores predeterminados para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 #, fuzzy msgid "&file-aptconf;" msgstr "apt-cdrom" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@@ -8630,7 -8630,7 +8739,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -8638,9 -8638,9 +8747,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -8899,7 -8899,7 +9008,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -9048,8 -9048,8 +9157,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -9137,7 -9137,7 +9246,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -9615,7 -9615,7 +9724,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -9714,8 -9714,8 +9823,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -9732,9 -9732,9 +9841,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" @@@ -9866,10 -9866,6 +9975,10 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" +#, fuzzy - #~ msgid "<option>APT::FTPArchive::AlwaysStat</option>" - #~ msgstr "<option>--all-versions</option>" ++#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" ++#~ msgstr "<filename>/etc/apt/apt.conf</filename>" + #, fuzzy #~ msgid "/usr/share/doc/apt/" #~ msgstr "/usr/share/doc/apt/" diff --cc doc/po/it.po index e4dd528a5,e4dd528a5..1dd0f0187 --- a/doc/po/it.po +++ b/doc/po/it.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: \n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@@ -739,7 -739,7 +739,7 @@@ msgid " msgstr "" #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -749,6 -749,6 +749,29 @@@ "\">\n" msgstr "" ++#. type: Plain text ++#: apt.ent:362 ++#, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++ ++#. type: Plain text ++#: apt.ent:368 ++#, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -812,7 -812,7 +835,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 msgid "Description" @@@ -1203,7 -1203,7 +1226,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 msgid "options" msgstr "" @@@ -1397,14 -1397,14 +1420,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1415,9 -1415,9 +1438,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1429,7 -1429,7 +1452,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1529,7 -1529,7 +1552,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "" @@@ -1729,7 -1729,7 +1752,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@@ -2263,7 -2263,7 +2286,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2375,20 -2375,20 +2398,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2682,12 -2682,12 +2707,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2696,26 -2696,26 +2740,26 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2786,7 -2786,7 +2830,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 #, fuzzy msgid "update" msgstr "upgrade" @@@ -3116,15 -3116,15 +3160,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3379,7 -3379,7 +3423,7 @@@ msgstr " 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" @@@ -3596,13 -3596,13 +3640,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3610,17 -3610,17 +3655,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3628,117 -3628,117 +3673,135 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "" @@@ -4432,13 -4432,13 +4495,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -4539,13 -4539,13 +4602,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -4555,36 -4555,36 +4629,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4595,7 -4595,7 +4669,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4609,7 -4609,7 +4683,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4617,7 -4617,7 +4691,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4629,7 -4629,7 +4703,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -4639,7 -4639,7 +4713,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4647,12 -4647,12 +4721,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4662,7 -4662,7 +4736,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4683,12 -4683,12 +4757,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4707,7 -4707,7 +4781,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4717,7 -4717,7 +4791,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -4726,7 -4726,7 +4800,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4736,18 -4736,18 +4810,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4760,12 -4760,12 +4834,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4773,18 -4773,18 +4847,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4796,19 -4796,19 +4870,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4825,13 -4825,13 +4899,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4846,7 -4846,7 +4920,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4856,36 -4856,36 +4930,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4894,7 -4894,7 +4968,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -4910,12 -4910,12 +4984,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4927,7 -4927,7 +5001,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4940,7 -4940,7 +5014,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4950,7 -4950,7 +5024,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -4958,7 -4958,7 +5032,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4969,7 -4969,7 +5043,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4982,13 -4982,13 +5056,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -4996,12 -4996,12 +5070,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5012,50 -5012,50 +5086,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5063,17 -5063,17 +5137,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5082,12 -5082,12 +5156,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5097,7 -5097,7 +5171,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5107,36 -5107,36 +5181,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5151,7 -5151,7 +5225,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5161,7 -5161,7 +5235,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5175,12 -5175,12 +5249,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5192,12 -5192,12 +5266,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5213,12 -5213,12 +5287,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5229,12 -5229,12 +5303,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5244,12 -5244,12 +5318,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -5261,12 -5261,12 +5335,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5278,7 -5278,7 +5352,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5292,12 -5292,12 +5366,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5306,12 -5306,12 +5380,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5322,7 -5322,7 +5396,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5330,7 -5330,7 +5404,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5338,7 -5338,7 +5412,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5348,111 -5348,111 +5422,111 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5460,93 -5460,93 +5534,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5556,12 -5556,12 +5630,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5578,91 -5578,91 +5652,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5670,32 -5670,32 +5744,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@@ -6812,7 -6812,7 +6886,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -6820,9 -6820,9 +6894,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -7075,7 -7075,7 +7149,7 @@@ msgstr " #, fuzzy msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7315,8 -7315,8 +7389,8 @@@ msgstr " #: guide.sgml:184 #, fuzzy msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -7456,7 -7456,7 +7530,7 @@@ msgstr " #, fuzzy 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 super-set of " ++"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." @@@ -8169,7 -8169,7 +8243,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -8267,8 -8267,8 +8341,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -8285,9 -8285,9 +8359,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" diff --cc doc/po/ja.po index ba04b200f,ba04b200f..c25fb9c82 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@@ -6,7 -6,7 +6,7 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2009-11-27 00:05+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@@ -1061,7 -1061,7 +1061,7 @@@ msgstr "&sources-list; ã«æå®ããã # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, fuzzy, no-wrap #| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)." msgid "" @@@ -1072,6 -1072,6 +1072,33 @@@ "\">\n" msgstr "åå¾ä¸ç¶ææå ±æ ¼ç´ã¨ãªã¢ãè¨å®é ç® - <literal>Dir::State::Lists</literal> (å¿ç¶çã«ä¸å®å¨)" ++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#. type: Plain text ++#: apt.ent:362 ++#, fuzzy, no-wrap ++#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>." ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "&sources-list; ã«æå®ãããããã±ã¼ã¸ãªã½ã¼ã¹ãã¨ã®ç¶ææå ±æ ¼ç´ã¨ãªã¢ãè¨å®é ç® - <literal>Dir::State::Lists</literal>" ++ ++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#. type: Plain text ++#: apt.ent:368 ++#, fuzzy, no-wrap ++#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)." ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "åå¾ä¸ç¶ææå ±æ ¼ç´ã¨ãªã¢ãè¨å®é ç® - <literal>Dir::State::Lists</literal> (å¿ç¶çã«ä¸å®å¨)" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -1160,7 -1160,7 +1187,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 msgid "Description" @@@ -1724,7 -1724,7 +1751,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 msgid "options" msgstr "ãªãã·ã§ã³" @@@ -1966,15 -1966,15 +1993,15 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "ãã¡ã¤ã«" @@@ -1986,9 -1986,9 +2013,9 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "é¢é£é ç®" @@@ -2002,7 -2002,7 +2029,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "è¨ºæã¡ãã»ã¼ã¸" @@@ -2140,7 -2140,7 +2167,7 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "ãªãã·ã§ã³" @@@ -2403,7 -2403,7 +2430,7 @@@ msgstr "è¨å®ç®æã®åå®¹ãè¡¨ç¤ºã # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3166,8 -3166,8 +3193,12 @@@ msgstr "Sources # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 ++#, fuzzy ++#| msgid "" ++#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++#| "source/Sources</filename>" msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" "Packages ãã¡ã¤ã«ã®åºååãè¨å®ãã¾ããããã©ã«ãã¯ <filename>$(DIST)/" @@@ -3318,29 -3318,29 +3349,39 @@@ msgstr " "<literal>TreeDefault</literal> ã»ã¯ã·ã§ã³ã§å®ç¾©ãããè¨å®ã¯ãã¹ã¦ã3 åã®æ°ã" "ãå¤æ°ã¨åæ§ã«ã<literal>Tree</literal> ã»ã¯ã·ã§ã³ã§ä½¿ç¨ã§ãã¾ãã" --# type: Content of: <refentry><refsect1><refsect2><para><informalexample> --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" --"<literal>Tree</literal> ã»ã¯ã·ã§ã³ãå¦çããéã<command>apt-ftparchive</" --"command> ã¯ä»¥ä¸ã®ãããªæä½ãè¡ãã¾ãã" -- # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 --#, no-wrap ++#, fuzzy, no-wrap ++#| msgid "" ++#| "for i in Sections do \n" ++#| " for j in Architectures do\n" ++#| " Generate for DIST=scope SECTION=i ARCH=j\n" msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " msgstr "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++# type: Content of: <refentry><refsect1><refsect2><para><informalexample> ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++#, fuzzy ++#| msgid "" ++#| "When processing a <literal>Tree</literal> section <command>apt-" ++#| "ftparchive</command> performs an operation similar to:" ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" ++msgstr "" ++"<literal>Tree</literal> ã»ã¯ã·ã§ã³ãå¦çããéã<command>apt-ftparchive</" ++"command> ã¯ä»¥ä¸ã®ãããªæä½ãè¡ãã¾ãã" ++ # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:360 @@@ -3723,12 -3723,12 +3764,33 @@@ msgstr " #: apt-ftparchive.1.xml:547 #, fuzzy #| msgid "<option>--version</option>" --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++#, fuzzy ++#| msgid "<option>--version</option>" ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "<option>--version</option>" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -3738,21 -3738,21 +3800,21 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "ãµã³ãã«" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3762,7 -3762,7 +3824,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -3903,7 -3903,7 +3965,7 @@@ msgstr " "&gnome-apt;, &wajig; ãªã©ãããã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "update" @@@ -4366,18 -4366,18 +4428,31 @@@ msgstr "<option>--fix-broken</option> # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 ++#, fuzzy ++#| 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 to deduce a likely solution. Any Package that are specified must " ++#| "completely correct the problem. The option is sometimes necessary when " ++#| "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>." 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" "ä¿®å¾© - ä¾åé¢ä¿ãå£ããã·ã¹ãã ã®ä¿®æ£ãè©¦ã¿ã¾ãããã®ãªãã·ã§ã³ã install ã " "remove ã¨ä¸ç·ã«ä½¿ãã¨ãã¯ãããã±ã¼ã¸ãæå®ããªãã¦ããã¾ãã¾ãããã©ã®ãã" @@@ -4710,10 -4710,10 +4785,17 @@@ msgstr "<option>--purge</option> # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 ++#, fuzzy ++#| 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. <option>remove --purge</option> is equivalent for " ++#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::" ++#| "Purge</literal>." 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" "åé¤ããéããåé¤ãã§ã¯ãªããå®å¨åé¤ããè¡ãã¾ãããå®å¨åé¤ããè¡ãã¨æç¤º" @@@ -4991,8 -4991,8 +5073,14 @@@ msgstr "APT ãã¼ç®¡çã¦ã¼ãã£ãª # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 ++#, fuzzy ++#| msgid "" ++#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" ++#| "option></arg>" msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" @@@ -5002,7 -5002,7 +5090,7 @@@ # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -5014,19 -5014,19 +5102,19 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "ã³ãã³ã" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "add <replaceable>filename</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -5038,70 -5038,70 +5126,70 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "del <replaceable>keyid</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "ä¿¡é ¼ãã¼ä¸è¦§ãããã¼ãåé¤ãã¾ãã" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "export <replaceable>keyid</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "ãã¼ <replaceable>keyid</replaceable> ãæ¨æºåºåã«åºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "exportall" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "ä¿¡é ¼ãããã¼ããã¹ã¦æ¨æºåºåã«åºåãã¾ãã" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "list" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "ä¿¡é ¼ãã¼ãä¸è¦§è¡¨ç¤ºãã¾ãã" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "finger" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "ä¿¡é ¼ãã¼ã®ãã£ã³ã¬ã¼ããªã³ããä¸è¦§è¡¨ç¤ºãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "adv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." @@@ -5111,7 -5111,7 +5199,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." @@@ -5119,43 -5119,43 +5207,62 @@@ msgstr " "Debian ã¢ã¼ã«ã¤ããã¼ã§ããã¼ã«ã«ãã¼ãªã³ã°ãæ´æ°ããããæå¹ã§ãªããã¼ããã¼" "ãªã³ã°ããåé¤ãã¾ãã" --# type: Content of: <refentry><refsect1><para> --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" --msgstr "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++# type: Content of: <refentry><refsect1><refsect2><para><programlisting> ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++#, fuzzy ++#| msgid "add <replaceable>filename</replaceable>" ++msgid "--keyring <replaceable>filename</replaceable>" ++msgstr "add <replaceable>filename</replaceable>" --# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." --msgstr "ãã¼ã«ã«ä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ãæ°ãããã¼ã¯ããã«è¿½å ããã¾ãã" ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" ++msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "ã¢ã¼ã«ã¤ããã¼ã®ãã¼ã«ã«ä¿¡é ¼ãã¼ã¿ãã¼ã¹ã§ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "Debian ã¢ã¼ã«ã¤ãä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ã§ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" @@@ -5163,13 -5163,13 +5270,13 @@@ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "åé¤ããã Debian ã¢ã¼ã«ã¤ãä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ã§ãã" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" @@@ -6212,13 -6212,13 +6319,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -6344,14 -6344,14 +6451,25 @@@ msgstr " "<literal>PDiffs</literal> ã¨å¼ã°ããå·®åããã¦ã³ãã¼ããããã¨ãã¾ããããã©" "ã«ãã§ã¯ True ã§ãã" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "Queue-Mode" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -6366,13 -6366,13 +6484,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "Retries" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -6381,13 -6381,13 +6499,13 @@@ msgstr " "ããããåæ°ã ããªãã©ã¤ãè¡ãã¾ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "Source-Symlinks" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." @@@ -6398,13 -6398,13 +6516,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@@ -6430,7 -6430,7 +6548,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -6455,7 -6455,7 +6573,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -6467,7 -6467,7 +6585,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 #, fuzzy #| msgid "" #| "One setting is provided to control the pipeline depth in cases where the " @@@ -6495,7 -6495,7 +6613,7 @@@ msgstr " "ã¾ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -6505,7 -6505,7 +6623,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -6514,12 -6514,12 +6632,12 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 #, fuzzy #| msgid "" #| "HTTPS URIs. Cache-control and proxy options are the same as for " @@@ -6537,7 -6537,7 +6655,7 @@@ msgstr " "ãã¦ãã¾ããã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -6559,13 -6559,13 +6677,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@@ -6608,7 -6608,7 +6726,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -6624,7 -6624,7 +6742,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -6638,7 -6638,7 +6756,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -6655,12 -6655,12 +6773,12 @@@ msgstr " # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, fuzzy, no-wrap #| msgid "\"/cdrom/\"::Mount \"foo\";" msgid "/cdrom/::Mount \"foo\";" @@@ -6668,7 -6668,7 +6786,7 @@@ msgstr "\"/cdrom/\"::Mount \"foo\"; # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -6689,13 -6689,13 +6807,13 @@@ msgstr " "ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "gpgv" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -6706,18 -6706,18 +6824,18 @@@ msgstr " "ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -6729,19 -6729,19 +6847,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -6758,13 -6758,13 +6876,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6779,7 -6779,7 +6897,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -6789,36 -6789,36 +6907,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -6827,7 -6827,7 +6945,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -6848,13 -6848,13 +6966,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "ãã£ã¬ã¯ããª" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -6874,7 -6874,7 +6992,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -6896,7 -6896,7 +7014,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -6911,7 -6911,7 +7029,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -6923,7 -6923,7 +7041,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@@ -6948,7 -6948,7 +7066,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6969,13 -6969,13 +7087,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "DSelect ã§ã® APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -6985,13 -6985,13 +7103,13 @@@ msgstr " "è¨å®é ç®ã§ãããã©ã«ãã®åä½ãå¶å¾¡ãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "Clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -7008,7 -7008,7 +7126,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@@ -7018,13 -7018,13 +7136,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "Updateoptions" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@@ -7033,13 -7033,13 +7151,13 @@@ msgstr " "ããã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -7049,13 -7049,13 +7167,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "APT ã dpkg ãå¼ã¶æ¹æ³" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -7065,7 -7065,7 +7183,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -7075,18 -7075,18 +7193,18 @@@ msgstr " "ããã°ãªãã¾ãããã¾ããåãªã¹ãã¯åä¸ã®å¼æ°ã¨ãã¦ &dpkg; ã«æ¸¡ããã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "Post-Invoke" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -7100,13 -7100,13 +7218,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -7122,7 -7122,7 +7240,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -7138,13 -7138,13 +7256,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "Run-Directory" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@@ -7154,13 -7154,13 +7272,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "Build-options" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@@ -7169,12 -7169,12 +7287,12 @@@ msgstr " "ã¾ããããã©ã«ãã§ã¯ç½²åãç¡å¹ã«ããå¨ãã¤ããªãçæãã¾ãã" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -7189,7 -7189,7 +7307,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -7199,7 -7199,7 +7317,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -7213,12 -7213,12 +7331,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -7231,14 -7231,14 +7349,14 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -7255,13 -7255,13 +7373,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ã¦ã¼ã¶ã®è¨å®" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -7272,12 -7272,12 +7390,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -7287,12 -7287,12 +7405,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -7304,12 -7304,12 +7422,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -7321,7 -7321,7 +7439,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -7335,12 -7335,12 +7453,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "Periodic ãªãã·ã§ã³ã¨ Archives ãªãã·ã§ã³" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -7354,12 -7354,12 +7472,12 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "ãããã°ãªãã·ã§ã³" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -7370,7 -7370,7 +7488,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -7381,7 -7381,7 +7499,7 @@@ msgstr " "ã«ãã¾ãã" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -7392,7 -7392,7 +7510,7 @@@ msgstr " "literal>) ãè¡ãå ´åã«ä½¿ç¨ãã¾ãã" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -7402,66 -7402,66 +7520,66 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ã½ã¼ã¹ã¸ã®ã¢ã¯ã»ã¹ã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "FTP ãç¨ããããã±ã¼ã¸ã®ãã¦ã³ãã¼ãã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP ãç¨ããããã±ã¼ã¸ã®ãã¦ã³ãã¼ãã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS ãç¨ããããã±ã¼ã¸ã®ãã¦ã³ãã¼ãã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -7469,46 -7469,46 +7587,46 @@@ msgstr " "<literal>gpg</literal> ãç¨ããæå·ç½²åã®æ¤è¨¼ã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -7516,93 -7516,93 +7634,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -7612,12 -7612,12 +7730,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -7634,91 -7634,91 +7752,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -7726,12 -7726,12 +7844,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -7739,7 -7739,7 +7857,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -7749,7 -7749,7 +7867,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@@ -7758,7 -7758,7 +7876,7 @@@ msgstr "&apt-conf; # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -9411,7 -9411,7 +9529,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -9419,9 -9419,9 +9537,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -9683,7 -9683,7 +9801,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -9832,8 -9832,8 +9950,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -9921,7 -9921,7 +10039,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -10415,7 -10415,7 +10533,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -10550,8 -10550,8 +10668,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -10574,9 -10574,9 +10692,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" @@@ -10717,6 -10717,6 +10835,14 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" ++# type: Content of: <refentry><refsect1><para> ++#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" ++#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" ++ ++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#~ msgid "Keyring of local trusted keys, new keys will be added here." ++#~ msgstr "ãã¼ã«ã«ä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ãæ°ãããã¼ã¯ããã«è¿½å ããã¾ãã" ++ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #~ msgid "" #~ "Disable Immediate Configuration; This dangerous option disables some of " diff --cc doc/po/pl.po index 7ee8cc964,7ee8cc964..80fa40db0 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@@ -739,7 -739,7 +739,7 @@@ msgid " msgstr "" #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -749,6 -749,6 +749,29 @@@ "\">\n" msgstr "" ++#. type: Plain text ++#: apt.ent:362 ++#, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++ ++#. type: Plain text ++#: apt.ent:368 ++#, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -811,7 -811,7 +834,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 #, fuzzy @@@ -1203,7 -1203,7 +1226,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 #, fuzzy msgid "options" msgstr "Kolejne kroki" @@@ -1398,14 -1398,14 +1421,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1416,9 -1416,9 +1439,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1430,7 -1430,7 +1453,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1530,7 -1530,7 +1553,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 #, fuzzy msgid "Options" msgstr "Kolejne kroki" @@@ -1732,7 -1732,7 +1755,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@@ -2267,7 -2267,7 +2290,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2379,20 -2379,20 +2402,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2688,12 -2688,12 +2713,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2702,26 -2702,26 +2746,26 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2791,7 -2791,7 +2835,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "" @@@ -3116,15 -3116,15 +3160,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3379,7 -3379,7 +3423,7 @@@ msgstr " 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" @@@ -3595,13 -3595,13 +3639,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3609,17 -3609,17 +3654,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3627,117 -3627,117 +3672,135 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "" @@@ -4434,13 -4434,13 +4497,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -4541,13 -4541,13 +4604,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -4557,36 -4557,36 +4631,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4597,7 -4597,7 +4671,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4611,7 -4611,7 +4685,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4619,7 -4619,7 +4693,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4631,7 -4631,7 +4705,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -4641,7 -4641,7 +4715,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4649,12 -4649,12 +4723,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4664,7 -4664,7 +4738,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4685,12 -4685,12 +4759,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4709,7 -4709,7 +4783,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4719,7 -4719,7 +4793,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -4728,7 -4728,7 +4802,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4738,18 -4738,18 +4812,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4762,12 -4762,12 +4836,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4775,18 -4775,18 +4849,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4798,19 -4798,19 +4872,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4827,13 -4827,13 +4901,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4848,7 -4848,7 +4922,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4858,36 -4858,36 +4932,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4896,7 -4896,7 +4970,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -4912,12 -4912,12 +4986,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4929,7 -4929,7 +5003,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4942,7 -4942,7 +5016,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4952,7 -4952,7 +5026,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -4960,7 -4960,7 +5034,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4971,7 -4971,7 +5045,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4984,12 -4984,12 +5058,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -4997,12 -4997,12 +5071,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5013,50 -5013,50 +5087,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5064,17 -5064,17 +5138,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5083,12 -5083,12 +5157,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5098,7 -5098,7 +5172,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5108,36 -5108,36 +5182,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5152,7 -5152,7 +5226,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5162,7 -5162,7 +5236,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5176,12 -5176,12 +5250,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5193,12 -5193,12 +5267,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5214,12 -5214,12 +5288,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5230,12 -5230,12 +5304,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5245,12 -5245,12 +5319,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -5262,12 -5262,12 +5336,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5279,7 -5279,7 +5353,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5293,12 -5293,12 +5367,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5307,12 -5307,12 +5381,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5323,7 -5323,7 +5397,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5331,7 -5331,7 +5405,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5339,7 -5339,7 +5413,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5349,111 -5349,111 +5423,111 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5461,93 -5461,93 +5535,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5557,12 -5557,12 +5631,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5579,91 -5579,91 +5653,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5671,32 -5671,32 +5745,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@@ -6813,7 -6813,7 +6887,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -6821,9 -6821,9 +6895,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -7052,7 -7052,7 +7126,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7200,8 -7200,8 +7274,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -7289,7 -7289,7 +7363,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -7793,7 -7793,7 +7867,7 @@@ msgstr " #, fuzzy msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -7951,8 -7951,8 +8025,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"em>. Then take the disc to the remote machine and configure the sources." ++"list. On the remote machine execute the following:" msgstr "" "PierwszÂ± rzeczÂ±, jakÂ± naleÂ¿y zrobiÃ¦ na oddalonym komputerze z Debianem to " "zamontowaÃ¦ dysk i przekopiowaÃ¦ na niego plik /var/lib/dpkg/status. " @@@ -7981,9 -7981,9 +8055,9 @@@ msgstr " #: offline.sgml:149 #, fuzzy msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" "Polecenie dist-upgrade moÂ¿na zastÂ±piÃ¦ kaÂ¿dym innym podstawowym poleceniem " diff --cc doc/po/pt_BR.po index 331cb4d3f,331cb4d3f..6f87a3d90 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: AndrÃ© LuÃs Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@@ -782,7 -782,7 +782,7 @@@ msgid " msgstr "" #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -792,6 -792,6 +792,29 @@@ "\">\n" msgstr "" ++#. type: Plain text ++#: apt.ent:362 ++#, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++ ++#. type: Plain text ++#: apt.ent:368 ++#, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -854,7 -854,7 +877,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 #, fuzzy @@@ -1249,7 -1249,7 +1272,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 msgid "options" msgstr "" @@@ -1443,14 -1443,14 +1466,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1461,9 -1461,9 +1484,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@@ -1476,7 -1476,7 +1499,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1576,7 -1576,7 +1599,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "" @@@ -1777,7 -1777,7 +1800,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@@ -2315,7 -2315,7 +2338,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2427,20 -2427,20 +2450,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2735,12 -2735,12 +2760,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2749,27 -2749,27 +2793,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2839,7 -2839,7 +2883,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "" @@@ -3164,15 -3164,15 +3208,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3427,7 -3427,7 +3471,7 @@@ msgstr " 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" @@@ -3643,13 -3643,13 +3687,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3657,17 -3657,17 +3702,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3675,119 -3675,119 +3720,139 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 #, fuzzy --msgid "<filename>/etc/apt/trusted.gpg</filename>" --msgstr "<filename>/etc/apt.conf</>" ++msgid "--keyring <replaceable>filename</replaceable>" ++msgstr "" ++"<programlisting>\n" ++"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 #, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt.conf</>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 #, fuzzy msgid "&apt-get;, &apt-secure;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -4483,13 -4483,13 +4548,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -4590,13 -4590,13 +4655,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -4606,36 -4606,36 +4682,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4646,7 -4646,7 +4722,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4660,7 -4660,7 +4736,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4668,7 -4668,7 +4744,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4680,7 -4680,7 +4756,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -4690,7 -4690,7 +4766,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4698,12 -4698,12 +4774,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4713,7 -4713,7 +4789,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4734,12 -4734,12 +4810,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4758,7 -4758,7 +4834,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4768,7 -4768,7 +4844,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -4777,7 -4777,7 +4853,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4787,18 -4787,18 +4863,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4811,12 -4811,12 +4887,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4824,18 -4824,18 +4900,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4847,19 -4847,19 +4923,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4876,13 -4876,13 +4952,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4897,7 -4897,7 +4973,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4907,36 -4907,36 +4983,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4945,7 -4945,7 +5021,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -4961,12 -4961,12 +5037,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4978,7 -4978,7 +5054,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4991,7 -4991,7 +5067,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -5001,7 -5001,7 +5077,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -5009,7 -5009,7 +5085,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -5020,7 -5020,7 +5096,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -5033,12 -5033,12 +5109,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -5046,12 -5046,12 +5122,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5062,50 -5062,50 +5138,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5113,17 -5113,17 +5189,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5132,12 -5132,12 +5208,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5147,7 -5147,7 +5223,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5157,36 -5157,36 +5233,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5201,7 -5201,7 +5277,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5211,7 -5211,7 +5287,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5225,12 -5225,12 +5301,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5242,12 -5242,12 +5318,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5263,12 -5263,12 +5339,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5279,12 -5279,12 +5355,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5294,12 -5294,12 +5370,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -5311,12 -5311,12 +5387,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5328,7 -5328,7 +5404,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5342,12 -5342,12 +5418,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5356,12 -5356,12 +5432,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5372,7 -5372,7 +5448,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5380,7 -5380,7 +5456,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5388,7 -5388,7 +5464,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5398,120 -5398,120 +5474,120 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5519,99 -5519,99 +5595,99 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5621,12 -5621,12 +5697,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5643,96 -5643,96 +5719,96 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5740,33 -5740,33 +5816,33 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -7299,7 -7299,7 +7375,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -7307,9 -7307,9 +7383,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -7526,7 -7526,7 +7602,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7674,8 -7674,8 +7750,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -7763,7 -7763,7 +7839,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -8241,7 -8241,7 +8317,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -8339,8 -8339,8 +8415,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -8357,9 -8357,9 +8433,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" @@@ -8491,6 -8491,6 +8567,10 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" ++#, fuzzy ++#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" ++#~ msgstr "<filename>/etc/apt.conf</>" ++ #, fuzzy #~ msgid "/usr/share/doc/apt/" #~ msgstr "/usr/share/doc/apt/"

From: David Kalnischkies Date: Wed, 13 Jan 2010 13:51:28 +0000 (+0100) Subject: merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back X-Git-Tag: 0.8.0~39^2~15 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/be4eec613e34a43f34eb9a9b227b69a58fe66ec8 merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back --- be4eec613e34a43f34eb9a9b227b69a58fe66ec8 diff --cc apt-pkg/contrib/configuration.cc index 89aa854a3,aaa669ffc..80b089fac --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@@ -829,8 -829,8 +829,8 @@@ bool ReadConfigFile(Configuration &Conf // ReadConfigDir - Read a directory of config files /*{{{*/ // --------------------------------------------------------------------- /* */ - bool ReadConfigDir(Configuration &Conf,const string &Dir,bool const &AsSectional, - unsigned const &Depth) + bool ReadConfigDir(Configuration &Conf,const string &Dir, - bool AsSectional, unsigned Depth) ++ bool const &AsSectional, unsigned const &Depth) { vector const List = GetListOfFilesInDir(Dir, "", true); diff --cc debian/changelog index cdf477cfd,3e377b726..ef6f846cb --- a/debian/changelog +++ b/debian/changelog @@@ -1,30 -1,15 +1,37 @@@ +apt (0.7.26) UNRELEASED; urgency=low + - [ Christian Perrier ] - * French manpage translation update - - [Chris Leick] - * spot & fix various typos in all manpages - * German manpage translation update - - [ David Kalnischkies ] + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) + * Ignore :qualifiers after package name in build dependencies + for now as long we don't understand them (Closes: #558103) + * apt-pkg/contrib/mmap.{cc,h}: + - extend it to have a growable flag - unused now but maybe... + * apt-pkg/pkgcache.h: + - use long instead of short for {Ver,Desc}File size, + patch from VÃctor Manuel JÃ¡quez Leal, thanks! (Closes: #538917) + * apt-pkg/acquire-item.cc: + - allow also to skip the last patch if target is reached, + thanks Bernhard R. Link! (Closes: #545699) + * ftparchive/writer.{cc,h}: + - add APT::FTPArchive::AlwaysStat to disable the too aggressive + caching if versions are build multiply times (not recommend) + Patch by Christoph Goehre, thanks! (Closes: #463260) ++ ++ -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 ++ + apt (0.7.25.1) unstable; urgency=low + + [ Christian Perrier ] + * French manpage translation update + * Russian translation update by Yuri Kozlov + Closes: #564171 + + [Chris Leick] + * spot & fix various typos in all manpages + * German manpage translation update + + [ David Kalnischkies ] * cmdline/apt-cache.cc: - remove translatable marker from the "%4i %s\n" string * buildlib/po4a_manpage.mak: diff --cc doc/po/apt-doc.pot index 46febf8ca,46febf8ca..fe7c6f514 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@@ -7,7 -7,7 +7,7 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -758,7 -758,7 +758,7 @@@ msgid " msgstr "" #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, no-wrap msgid "" " " @@@ -770,6 -770,6 +770,34 @@@ "\">\n" msgstr "" ++#. type: Plain text ++#: apt.ent:362 ++#, no-wrap ++msgid "" ++"/etc/apt/trusted.gpg\n" ++" Keyring of local trusted keys, new keys will be added " ++"here.\n" ++" Configuration Item: " ++"Dir::Etc::Trusted.\n" ++" \n" ++msgstr "" ++ ++#. type: Plain text ++#: apt.ent:368 ++#, no-wrap ++msgid "" ++" " ++"/etc/apt/trusted.gpg.d/\n" ++" File fragments for the trusted keys, additional " ++"keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item " ++"Dir::Etc::TrustedParts.\n" ++" \n" ++"\">\n" ++msgstr "" ++ #. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@@ -828,7 -828,7 +856,7 @@@ msgid " msgstr "" #. type: Content of: --#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 ++#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 msgid "Description" msgstr "" @@@ -1218,7 -1218,7 +1246,7 @@@ msgid " 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:484 apt.conf.5.xml:506 ++#: 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:491 apt.conf.5.xml:513 msgid "options" msgstr "" @@@ -1411,12 -1411,12 +1439,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 ++#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1426,7 -1426,7 +1454,7 @@@ msgid "&file-sourceslist; &file-stateli msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233 ++#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1436,7 -1436,7 +1464,7 @@@ msgid "&apt-conf;, &sources-list;, &apt msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 ++#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1535,7 -1535,7 +1563,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "" @@@ -1735,7 -1735,7 +1763,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@@ -2270,7 -2270,7 +2298,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to " ++"Sets the output Sources file. Defaults to " "<filename>$(DIST)/$(SECTION)/source/Sources</filename>" msgstr "" @@@ -2383,20 -2383,20 +2411,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section " --"<command>apt-ftparchive</command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section " ++"<command>apt-ftparchive</command> performs an operation similar to: " ++"<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2690,12 -2690,12 +2720,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2704,12 -2704,12 +2753,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@@ -2718,14 -2718,14 +2767,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2796,7 -2796,7 +2845,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "" @@@ -3124,15 -3124,15 +3173,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3389,7 -3389,7 +3438,7 @@@ msgstr " 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. <option>remove --purge</option> is equivalent for " ++"purged. <option>remove --purge</option> is equivalent to the " "<option>purge</option> command. Configuration Item: " "<literal>APT::Get::Purge</literal>." msgstr "" @@@ -3609,13 -3609,13 +3658,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " --"<arg " ++"<command>apt-key</command> <arg><option>--keyring " ++"<replaceable>filename</replaceable></option></arg> " ++"<arg><replaceable>command</replaceable></arg> <arg " "rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3623,17 -3623,17 +3673,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3641,116 -3641,116 +3691,134 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through " ++"<filename>trusted.gpg</filename> is the primary keyring which means that " ++"e.g. new keys are added to this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "" @@@ -4445,13 -4445,13 +4513,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a " "Pre-Dependency. So in theory it is possible that APT encounters a situation " --"in which it is unable to perform immediate configuration, error out and " ++"in which it is unable to perform immediate configuration, errors out and " "refers to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like " "<literal>dist-upgrade</literal> is run with this option disabled it should " @@@ -4552,13 -4552,13 +4620,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@@ -4568,36 -4568,36 +4647,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4609,7 -4609,7 +4688,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4623,7 -4623,7 +4702,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4631,7 -4631,7 +4710,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4643,7 -4643,7 +4722,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@@ -4653,7 -4653,7 +4732,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4661,12 -4661,12 +4740,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4676,7 -4676,7 +4755,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4698,12 -4698,12 +4777,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4723,7 -4723,7 +4802,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4733,7 -4733,7 +4812,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@@ -4743,7 -4743,7 +4822,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4753,18 -4753,18 +4832,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4777,12 -4777,12 +4856,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4790,12 -4790,12 +4869,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@@ -4803,7 -4803,7 +4882,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4815,19 -4815,19 +4894,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4844,13 -4844,13 +4923,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@@ -4865,7 -4865,7 +4944,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4875,17 -4875,17 +4954,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Description in 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 " @@@ -4893,18 -4893,18 +4972,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> --#: apt.conf.5.xml:413 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4913,7 -4913,7 +4992,7 @@@ "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 " ++"without actually use them if the environment doesn't specify 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 " @@@ -4930,12 -4930,12 +5009,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4947,7 -4947,7 +5026,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4960,7 -4960,7 +5039,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4970,7 -4970,7 +5049,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -4978,7 -4978,7 +5057,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@@ -4990,7 -4990,7 +5069,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -5003,12 -5003,12 +5082,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -5016,12 -5016,12 +5095,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5032,50 -5032,50 +5111,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5083,17 -5083,17 +5162,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5102,12 -5102,12 +5181,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5117,7 -5117,7 +5196,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5128,36 -5128,36 +5207,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5172,7 -5172,7 +5251,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5182,7 -5182,7 +5261,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5196,12 -5196,12 +5275,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5213,12 -5213,12 +5292,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5235,12 -5235,12 +5314,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@@ -5252,12 -5252,12 +5331,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5267,12 -5267,12 +5346,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@@ -5284,12 -5284,12 +5363,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5301,7 -5301,7 +5380,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5315,12 -5315,12 +5394,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5329,12 -5329,12 +5408,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5345,7 -5345,7 +5424,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@@ -5353,7 -5353,7 +5432,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@@ -5361,7 -5361,7 +5440,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5371,110 -5371,110 +5450,110 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5482,92 -5482,92 +5561,92 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@@ -5577,12 -5577,12 +5656,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@@ -5600,90 -5600,90 +5679,90 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5691,32 -5691,32 +5770,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@@ -6844,7 -6844,7 +6923,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -6853,8 -6853,8 +6932,8 @@@ msgid " "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme " "<literal>apt-transport-<replaceable>method</replaceable></literal>. The APT " --"team e.g. maintain also the <literal>apt-transport-https</literal> package " --"which provides access methods for https-URIs with features similiar to the " ++"team e.g. maintains also the <literal>apt-transport-https</literal> package " ++"which provides access methods for https-URIs with features similar to the " "http method, but other methods for using e.g. debtorrent are also available, " "see <citerefentry> " "<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> " @@@ -7075,7 -7075,7 +7154,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7224,11 -7224,11 +7303,11 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in " --"<prgn>dselect</prgn> and then choose the APT method. You will be prompted " --"for a set of Sources which are places to fetch archives from. These " --"can be remote Internet sites, local Debian mirrors or CDROMs. 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 <prgn>dselect</prgn> " ++"and then choose the APT method. You will be prompted for a set of " ++"Sources which are places to fetch archives from. These can be " ++"remote Internet sites, local Debian mirrors or CDROMs. 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 CDROM 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 " @@@ -7313,7 -7313,7 +7392,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -7793,7 -7793,7 +7872,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -7892,7 -7892,7 +7971,7 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy " "/var/lib/dpkg/status to it. You will also need to create the " "directories outlined in the Overview, archives/partial/ and " --"lists/partial/ Then take the disc to the remote machine and " ++"lists/partial/. Then take the disc to the remote machine and " "configure the sources.list. On the remote machine execute the following:" msgstr "" @@@ -7910,9 -7910,9 +7989,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" diff --cc doc/po/es.po index 65456e495,ed7ca3d8f..c44bb7853 --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -14,7 -14,7 +14,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2004-09-20 17:05+0000\n" "Last-Translator: RubÃ©n Porras Campo <nahoo@inicia.es>\n" "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" @@@ -789,7 -789,7 +789,7 @@@ msgstr " "Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>." #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, fuzzy, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -811,6 -811,6 +811,53 @@@ msgstr " "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" "Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial)." ++#. type: Plain text ++#: apt.ent:362 ++#, fuzzy, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" ++"Directorio donde se almacena la informaciÃ³n del estado de cada paquete fuente por cada sitio especificado &sources-list; OpciÃ³n de configuraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" ++"Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" ++"Directorio donde se almacena la informaciÃ³n del estado de cada paquete fuente por cada sitio especificado &sources-list; OpciÃ³n de configuraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" ++"Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" ++"Directorio donde se almacena la informaciÃ³n del estado de cada paquete fuente por cada sitio especificado &sources-list; OpciÃ³n de configuraciÃ³n: <literal>Dir::State::Lists</literal>.\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" ++"Directorio donde se almacena informaciÃ³n de estado por cada sitio especificado en &sources-list; OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal>." ++ ++#. type: Plain text ++#: apt.ent:368 ++#, fuzzy, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (lo que implica que no estarÃ¡n completos).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (lo que implica que no estarÃ¡n completos).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (lo que implica que no estarÃ¡n completos).\n" ++"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" ++"Directorio de almacenamiento para la informaciÃ³n de estado en trÃ¡nsito. OpciÃ³n de ConfiguraciÃ³n: <literal>Dir::State::Lists</literal> (Implica partial)." ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -903,7 -903,7 +950,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 #, fuzzy @@@ -1494,7 -1494,7 +1541,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 #, fuzzy msgid "options" msgstr "Opciones" @@@ -1759,7 -1759,7 +1806,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 #, fuzzy msgid "&apt-commonoptions;" @@@ -1769,8 -1769,8 +1816,8 @@@ msgstr " " " #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 #, fuzzy msgid "Files" msgstr "Ficheros" @@@ -1782,9 -1782,9 +1829,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@@ -1831,7 -1831,7 +1878,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 #, fuzzy msgid "Diagnostics" @@@ -1975,7 -1975,7 +2022,7 @@@ msgstr " "option> una de las siguientes Ã³rdenes deben de estar presentes." #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 #, fuzzy msgid "Options" msgstr "Opciones" @@@ -2257,7 -2257,7 +2304,7 @@@ msgid "Just show the contents of the co msgstr "SÃ³lo muestra el contenido del espacio de configuraciÃ³n." #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@@ -2821,7 -2821,7 +2868,7 @@@ msgstr "Source-Symlinks #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2936,20 -2936,20 +2983,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -3270,12 -3270,12 +3319,32 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 #, fuzzy --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++#, fuzzy ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "<option>--all-versions</option>" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -3284,27 -3284,27 +3353,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 #, fuzzy msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " @@@ -3386,7 -3386,7 +3455,7 @@@ msgstr " "dselect(8), aptitude, synaptic, gnome-apt and wajig." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 #, fuzzy msgid "update" msgstr "update" @@@ -3872,15 -3872,15 +3941,15 @@@ msgstr "<option>--fix-broken</option> 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" "Intenta arreglar un sistema con dependencias actualmente rotas. Esta opciÃ³n " "usada conjuntamente con install/remove, puede omitir cualquier paquete para " @@@ -4246,7 -4246,7 +4315,7 @@@ msgstr "<option>--purge</option> 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" "Borra los archivos de configuraciÃ³n de todos los paquetes que sean " @@@ -4540,14 -4540,14 +4609,25 @@@ msgstr "utilidad APT para administraciÃ #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 ++#, fuzzy msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" ++"<cmdsynopsis sepchar=\" \">\n" ++"<command>apt-cdrom</command>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvrmfan</option></arg>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-d=<replaceable>cdrom " ++"punto_de_montaje</replaceable></option></arg>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de " ++"configuraciÃ³n</replaceable></option></arg>\n" ++"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</" ++"replaceable></option></arg>" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -4555,18 -4555,18 +4635,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 #, fuzzy msgid "add <replaceable>filename</replaceable>" msgstr "add <replaceable>fichero(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -4574,123 -4574,123 +4654,141 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 #, fuzzy msgid "del <replaceable>keyid</replaceable>" msgstr "add <replaceable>fichero(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 #, fuzzy msgid "export <replaceable>keyid</replaceable>" msgstr "dotty <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 #, fuzzy msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "dotty <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 #, fuzzy msgid "adv" msgstr "add" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 #, fuzzy --msgid "<filename>/etc/apt/trusted.gpg</filename>" --msgstr "<filename>/etc/apt/apt.conf</filename>" ++msgid "--keyring <replaceable>filename</replaceable>" ++msgstr "add <replaceable>fichero(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 #, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/apt.conf</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 #, fuzzy msgid "&apt-get;, &apt-secure;" msgstr "&apt-conf;, &apt-get;, &sources-list;" @@@ -5488,13 -5488,13 +5586,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -5624,14 -5624,14 +5722,25 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 #, fuzzy msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 #, fuzzy msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" @@@ -5647,13 -5647,13 +5756,13 @@@ msgstr " "serÃ¡ abierta una conexiÃ³n por cada tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 #, fuzzy msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 #, fuzzy msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " @@@ -5663,13 -5663,13 +5772,13 @@@ msgstr " "los ficheros fallidos el nÃºmero de veces dado." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 #, fuzzy msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 #, fuzzy msgid "" "Use symlinks for source archives. If set to true then source archives will " @@@ -5679,13 -5679,13 +5788,13 @@@ msgstr " "fuente se enlazarÃ¡n a ser posible, en vez de copiarse. Por omisiÃ³n es true." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 #, fuzzy msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 #, fuzzy msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@@ -5703,7 -5703,7 +5812,7 @@@ msgstr " "de entorno <envar>http_proxy</envar> modifica todas las preferencias." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 #, fuzzy msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " @@@ -5728,7 -5728,7 +5837,7 @@@ msgstr " "Nota: Squid 2.0.2 no soporta ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 #, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " @@@ -5740,7 -5740,7 +5849,7 @@@ msgstr " "realizar la conexiÃ³n y para recibir datos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 #, fuzzy msgid "" "One setting is provided to control the pipeline depth in cases where the " @@@ -5760,7 -5760,7 +5869,7 @@@ msgstr " "necesiten esto violan el RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -5770,7 -5770,7 +5879,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -5778,13 -5778,13 +5887,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 #, fuzzy msgid "https" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -5794,7 -5794,7 +5903,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -5815,13 -5815,13 +5924,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 #, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 #, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " @@@ -5853,7 -5853,7 +5962,7 @@@ msgstr " "de la URI correspondiente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 #, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " @@@ -5870,7 -5870,7 +5979,7 @@@ msgstr " "fichero de configuraciÃ³n de muestra para ver ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 #, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" @@@ -5885,7 -5885,7 +5994,7 @@@ msgstr " "eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 #, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " @@@ -5901,19 -5901,19 +6010,19 @@@ msgstr " "la mayorÃa de los servidores FTP no soportan RFC2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 #, fuzzy msgid "cdrom" msgstr "apt-cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 #, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " @@@ -5933,12 -5933,12 +6042,12 @@@ msgstr " "antiguas). Respecto a la sintaxis se pone" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -5946,18 -5946,18 +6055,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -5969,19 -5969,19 +6078,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -5998,13 -5998,13 +6107,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6019,7 -6019,7 +6128,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -6029,36 -6029,36 +6138,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -6067,7 -6067,7 +6176,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -6086,13 -6086,13 +6195,13 @@@ msgstr " "paquetes y los manejadores de URI." #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 #, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 #, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " @@@ -6113,7 -6113,7 +6222,7 @@@ msgstr " "filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 #, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " @@@ -6135,7 -6135,7 +6244,7 @@@ msgstr " "literal> el directorio predeterminado estÃ¡ en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 #, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " @@@ -6152,7 -6152,7 +6261,7 @@@ msgstr " "envar>)." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 #, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " @@@ -6164,7 -6164,7 +6273,7 @@@ msgstr " "esto se carga el fichero principal de configuraciÃ³n." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 #, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" @@@ -6182,7 -6182,7 +6291,7 @@@ msgstr " "respectivos programas." #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6195,13 -6195,13 +6304,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 #, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 #, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " @@@ -6213,13 -6213,13 +6322,13 @@@ msgstr " "la secciÃ³n <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 #, fuzzy msgid "Clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 #, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " @@@ -6237,7 -6237,7 +6346,7 @@@ msgstr " "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@@ -6247,13 -6247,13 +6356,13 @@@ msgstr " "ordenes cuando se ejecuta en la fase de instalaciÃ³n." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 #, fuzzy msgid "Updateoptions" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@@ -6263,13 -6263,13 +6372,13 @@@ msgstr " "ordenes cuando se ejecuta en la fase de actualizaciÃ³n." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 #, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 #, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " @@@ -6279,13 -6279,13 +6388,13 @@@ msgstr " "continuar. Por omisiÃ³n sÃ³lo pregunta en caso de error." #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 #, fuzzy msgid "How APT calls dpkg" msgstr "Como APT llama a dpkg" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 #, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " @@@ -6295,7 -6295,7 +6404,7 @@@ msgstr " "encuentran en la secciÃ³n <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 #, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " @@@ -6307,19 -6307,19 +6416,19 @@@ msgstr " "como un sÃ³lo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 #, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 #, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 #, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " @@@ -6333,13 -6333,13 +6442,13 @@@ msgstr " "si alguna falla APT abortarÃ¡." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 #, fuzzy msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 #, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " @@@ -6355,7 -6355,7 +6464,7 @@@ msgstr " "todos los .deb que va ha instalar por la entrada estÃ¡ndar, uno por lÃnea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 #, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " @@@ -6371,13 -6371,13 +6480,13 @@@ msgstr " "dada a <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 #, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 #, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" @@@ -6387,13 -6387,13 +6496,13 @@@ msgstr " "omisiÃ³n es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 #, fuzzy msgid "Build-options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 #, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " @@@ -6404,12 -6404,12 +6513,12 @@@ msgstr " "binarios." #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -6424,7 -6424,7 +6533,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -6434,7 -6434,7 +6543,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -6448,12 -6448,12 +6557,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -6465,12 -6465,12 +6574,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -6486,12 -6486,12 +6595,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -6502,12 -6502,12 +6611,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -6517,12 -6517,12 +6626,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -6534,12 -6534,12 +6643,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -6551,7 -6551,7 +6660,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -6565,12 -6565,12 +6674,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -6579,13 -6579,13 +6688,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 #, fuzzy msgid "Debug options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -6596,7 -6596,7 +6705,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -6604,7 -6604,7 +6713,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -6612,7 -6612,7 +6721,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -6622,120 -6622,120 +6731,120 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "La lÃnea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -6743,99 -6743,99 +6852,99 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "La lÃnea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "La lÃnea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -6845,12 -6845,12 +6954,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -6867,96 -6867,96 +6976,96 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "La lÃnea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "La lÃnea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "La lÃnea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "La lÃnea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "La lÃnea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -6964,20 -6964,20 +7073,20 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "La lÃnea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@@ -6987,14 -6987,14 +7096,14 @@@ msgstr " "los valores predeterminados para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 #, fuzzy msgid "&file-aptconf;" msgstr "apt-cdrom" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@@ -8630,7 -8630,7 +8739,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -8638,9 -8638,9 +8747,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -8899,7 -8899,7 +9008,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -9048,8 -9048,8 +9157,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -9137,7 -9137,7 +9246,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -9615,7 -9615,7 +9724,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -9714,8 -9714,8 +9823,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -9732,9 -9732,9 +9841,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" @@@ -9866,10 -9866,6 +9975,10 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" +#, fuzzy - #~ msgid "<option>APT::FTPArchive::AlwaysStat</option>" - #~ msgstr "<option>--all-versions</option>" ++#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" ++#~ msgstr "<filename>/etc/apt/apt.conf</filename>" + #, fuzzy #~ msgid "/usr/share/doc/apt/" #~ msgstr "/usr/share/doc/apt/" diff --cc doc/po/it.po index e4dd528a5,e4dd528a5..1dd0f0187 --- a/doc/po/it.po +++ b/doc/po/it.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: \n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@@ -739,7 -739,7 +739,7 @@@ msgid " msgstr "" #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -749,6 -749,6 +749,29 @@@ "\">\n" msgstr "" ++#. type: Plain text ++#: apt.ent:362 ++#, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++ ++#. type: Plain text ++#: apt.ent:368 ++#, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -812,7 -812,7 +835,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 msgid "Description" @@@ -1203,7 -1203,7 +1226,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 msgid "options" msgstr "" @@@ -1397,14 -1397,14 +1420,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1415,9 -1415,9 +1438,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1429,7 -1429,7 +1452,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1529,7 -1529,7 +1552,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "" @@@ -1729,7 -1729,7 +1752,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@@ -2263,7 -2263,7 +2286,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2375,20 -2375,20 +2398,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2682,12 -2682,12 +2707,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2696,26 -2696,26 +2740,26 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2786,7 -2786,7 +2830,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 #, fuzzy msgid "update" msgstr "upgrade" @@@ -3116,15 -3116,15 +3160,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3379,7 -3379,7 +3423,7 @@@ msgstr " 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" @@@ -3596,13 -3596,13 +3640,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3610,17 -3610,17 +3655,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3628,117 -3628,117 +3673,135 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "" @@@ -4432,13 -4432,13 +4495,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -4539,13 -4539,13 +4602,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -4555,36 -4555,36 +4629,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4595,7 -4595,7 +4669,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4609,7 -4609,7 +4683,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4617,7 -4617,7 +4691,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4629,7 -4629,7 +4703,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -4639,7 -4639,7 +4713,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4647,12 -4647,12 +4721,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4662,7 -4662,7 +4736,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4683,12 -4683,12 +4757,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4707,7 -4707,7 +4781,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4717,7 -4717,7 +4791,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -4726,7 -4726,7 +4800,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4736,18 -4736,18 +4810,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4760,12 -4760,12 +4834,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4773,18 -4773,18 +4847,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4796,19 -4796,19 +4870,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4825,13 -4825,13 +4899,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4846,7 -4846,7 +4920,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4856,36 -4856,36 +4930,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4894,7 -4894,7 +4968,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -4910,12 -4910,12 +4984,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4927,7 -4927,7 +5001,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4940,7 -4940,7 +5014,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4950,7 -4950,7 +5024,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -4958,7 -4958,7 +5032,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4969,7 -4969,7 +5043,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4982,13 -4982,13 +5056,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -4996,12 -4996,12 +5070,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5012,50 -5012,50 +5086,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5063,17 -5063,17 +5137,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5082,12 -5082,12 +5156,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5097,7 -5097,7 +5171,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5107,36 -5107,36 +5181,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5151,7 -5151,7 +5225,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5161,7 -5161,7 +5235,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5175,12 -5175,12 +5249,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5192,12 -5192,12 +5266,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5213,12 -5213,12 +5287,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5229,12 -5229,12 +5303,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5244,12 -5244,12 +5318,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -5261,12 -5261,12 +5335,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5278,7 -5278,7 +5352,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5292,12 -5292,12 +5366,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5306,12 -5306,12 +5380,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5322,7 -5322,7 +5396,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5330,7 -5330,7 +5404,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5338,7 -5338,7 +5412,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5348,111 -5348,111 +5422,111 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5460,93 -5460,93 +5534,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5556,12 -5556,12 +5630,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5578,91 -5578,91 +5652,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5670,32 -5670,32 +5744,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@@ -6812,7 -6812,7 +6886,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -6820,9 -6820,9 +6894,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -7075,7 -7075,7 +7149,7 @@@ msgstr " #, fuzzy msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7315,8 -7315,8 +7389,8 @@@ msgstr " #: guide.sgml:184 #, fuzzy msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -7456,7 -7456,7 +7530,7 @@@ msgstr " #, fuzzy 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 super-set of " ++"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." @@@ -8169,7 -8169,7 +8243,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -8267,8 -8267,8 +8341,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -8285,9 -8285,9 +8359,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" diff --cc doc/po/ja.po index ba04b200f,ba04b200f..c25fb9c82 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@@ -6,7 -6,7 +6,7 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2009-11-27 00:05+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@@ -1061,7 -1061,7 +1061,7 @@@ msgstr "&sources-list; ã«æå®ããã # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, fuzzy, no-wrap #| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)." msgid "" @@@ -1072,6 -1072,6 +1072,33 @@@ "\">\n" msgstr "åå¾ä¸ç¶ææå ±æ ¼ç´ã¨ãªã¢ãè¨å®é ç® - <literal>Dir::State::Lists</literal> (å¿ç¶çã«ä¸å®å¨)" ++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#. type: Plain text ++#: apt.ent:362 ++#, fuzzy, no-wrap ++#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>." ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "&sources-list; ã«æå®ãããããã±ã¼ã¸ãªã½ã¼ã¹ãã¨ã®ç¶ææå ±æ ¼ç´ã¨ãªã¢ãè¨å®é ç® - <literal>Dir::State::Lists</literal>" ++ ++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#. type: Plain text ++#: apt.ent:368 ++#, fuzzy, no-wrap ++#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)." ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "åå¾ä¸ç¶ææå ±æ ¼ç´ã¨ãªã¢ãè¨å®é ç® - <literal>Dir::State::Lists</literal> (å¿ç¶çã«ä¸å®å¨)" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -1160,7 -1160,7 +1187,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 msgid "Description" @@@ -1724,7 -1724,7 +1751,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 msgid "options" msgstr "ãªãã·ã§ã³" @@@ -1966,15 -1966,15 +1993,15 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "ãã¡ã¤ã«" @@@ -1986,9 -1986,9 +2013,9 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "é¢é£é ç®" @@@ -2002,7 -2002,7 +2029,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "è¨ºæã¡ãã»ã¼ã¸" @@@ -2140,7 -2140,7 +2167,7 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "ãªãã·ã§ã³" @@@ -2403,7 -2403,7 +2430,7 @@@ msgstr "è¨å®ç®æã®åå®¹ãè¡¨ç¤ºã # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3166,8 -3166,8 +3193,12 @@@ msgstr "Sources # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 ++#, fuzzy ++#| msgid "" ++#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++#| "source/Sources</filename>" msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" "Packages ãã¡ã¤ã«ã®åºååãè¨å®ãã¾ããããã©ã«ãã¯ <filename>$(DIST)/" @@@ -3318,29 -3318,29 +3349,39 @@@ msgstr " "<literal>TreeDefault</literal> ã»ã¯ã·ã§ã³ã§å®ç¾©ãããè¨å®ã¯ãã¹ã¦ã3 åã®æ°ã" "ãå¤æ°ã¨åæ§ã«ã<literal>Tree</literal> ã»ã¯ã·ã§ã³ã§ä½¿ç¨ã§ãã¾ãã" --# type: Content of: <refentry><refsect1><refsect2><para><informalexample> --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" --"<literal>Tree</literal> ã»ã¯ã·ã§ã³ãå¦çããéã<command>apt-ftparchive</" --"command> ã¯ä»¥ä¸ã®ãããªæä½ãè¡ãã¾ãã" -- # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 --#, no-wrap ++#, fuzzy, no-wrap ++#| msgid "" ++#| "for i in Sections do \n" ++#| " for j in Architectures do\n" ++#| " Generate for DIST=scope SECTION=i ARCH=j\n" msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " msgstr "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++# type: Content of: <refentry><refsect1><refsect2><para><informalexample> ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++#, fuzzy ++#| msgid "" ++#| "When processing a <literal>Tree</literal> section <command>apt-" ++#| "ftparchive</command> performs an operation similar to:" ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" ++msgstr "" ++"<literal>Tree</literal> ã»ã¯ã·ã§ã³ãå¦çããéã<command>apt-ftparchive</" ++"command> ã¯ä»¥ä¸ã®ãããªæä½ãè¡ãã¾ãã" ++ # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:360 @@@ -3723,12 -3723,12 +3764,33 @@@ msgstr " #: apt-ftparchive.1.xml:547 #, fuzzy #| msgid "<option>--version</option>" --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++#, fuzzy ++#| msgid "<option>--version</option>" ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "<option>--version</option>" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -3738,21 -3738,21 +3800,21 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "ãµã³ãã«" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3762,7 -3762,7 +3824,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -3903,7 -3903,7 +3965,7 @@@ msgstr " "&gnome-apt;, &wajig; ãªã©ãããã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "update" @@@ -4366,18 -4366,18 +4428,31 @@@ msgstr "<option>--fix-broken</option> # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 ++#, fuzzy ++#| 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 to deduce a likely solution. Any Package that are specified must " ++#| "completely correct the problem. The option is sometimes necessary when " ++#| "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>." 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" "ä¿®å¾© - ä¾åé¢ä¿ãå£ããã·ã¹ãã ã®ä¿®æ£ãè©¦ã¿ã¾ãããã®ãªãã·ã§ã³ã install ã " "remove ã¨ä¸ç·ã«ä½¿ãã¨ãã¯ãããã±ã¼ã¸ãæå®ããªãã¦ããã¾ãã¾ãããã©ã®ãã" @@@ -4710,10 -4710,10 +4785,17 @@@ msgstr "<option>--purge</option> # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 ++#, fuzzy ++#| 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. <option>remove --purge</option> is equivalent for " ++#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::" ++#| "Purge</literal>." 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" "åé¤ããéããåé¤ãã§ã¯ãªããå®å¨åé¤ããè¡ãã¾ãããå®å¨åé¤ããè¡ãã¨æç¤º" @@@ -4991,8 -4991,8 +5073,14 @@@ msgstr "APT ãã¼ç®¡çã¦ã¼ãã£ãª # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 ++#, fuzzy ++#| msgid "" ++#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" ++#| "option></arg>" msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" @@@ -5002,7 -5002,7 +5090,7 @@@ # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -5014,19 -5014,19 +5102,19 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "ã³ãã³ã" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "add <replaceable>filename</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -5038,70 -5038,70 +5126,70 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "del <replaceable>keyid</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "ä¿¡é ¼ãã¼ä¸è¦§ãããã¼ãåé¤ãã¾ãã" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "export <replaceable>keyid</replaceable>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "ãã¼ <replaceable>keyid</replaceable> ãæ¨æºåºåã«åºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "exportall" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "ä¿¡é ¼ãããã¼ããã¹ã¦æ¨æºåºåã«åºåãã¾ãã" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "list" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "ä¿¡é ¼ãã¼ãä¸è¦§è¡¨ç¤ºãã¾ãã" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "finger" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "ä¿¡é ¼ãã¼ã®ãã£ã³ã¬ã¼ããªã³ããä¸è¦§è¡¨ç¤ºãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "adv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." @@@ -5111,7 -5111,7 +5199,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." @@@ -5119,43 -5119,43 +5207,62 @@@ msgstr " "Debian ã¢ã¼ã«ã¤ããã¼ã§ããã¼ã«ã«ãã¼ãªã³ã°ãæ´æ°ããããæå¹ã§ãªããã¼ããã¼" "ãªã³ã°ããåé¤ãã¾ãã" --# type: Content of: <refentry><refsect1><para> --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" --msgstr "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++# type: Content of: <refentry><refsect1><refsect2><para><programlisting> ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++#, fuzzy ++#| msgid "add <replaceable>filename</replaceable>" ++msgid "--keyring <replaceable>filename</replaceable>" ++msgstr "add <replaceable>filename</replaceable>" --# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." --msgstr "ãã¼ã«ã«ä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ãæ°ãããã¼ã¯ããã«è¿½å ããã¾ãã" ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" ++msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "ã¢ã¼ã«ã¤ããã¼ã®ãã¼ã«ã«ä¿¡é ¼ãã¼ã¿ãã¼ã¹ã§ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "Debian ã¢ã¼ã«ã¤ãä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ã§ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" @@@ -5163,13 -5163,13 +5270,13 @@@ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "åé¤ããã Debian ã¢ã¼ã«ã¤ãä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ã§ãã" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" @@@ -6212,13 -6212,13 +6319,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -6344,14 -6344,14 +6451,25 @@@ msgstr " "<literal>PDiffs</literal> ã¨å¼ã°ããå·®åããã¦ã³ãã¼ããããã¨ãã¾ããããã©" "ã«ãã§ã¯ True ã§ãã" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "Queue-Mode" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -6366,13 -6366,13 +6484,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "Retries" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -6381,13 -6381,13 +6499,13 @@@ msgstr " "ããããåæ°ã ããªãã©ã¤ãè¡ãã¾ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "Source-Symlinks" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." @@@ -6398,13 -6398,13 +6516,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@@ -6430,7 -6430,7 +6548,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -6455,7 -6455,7 +6573,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -6467,7 -6467,7 +6585,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 #, fuzzy #| msgid "" #| "One setting is provided to control the pipeline depth in cases where the " @@@ -6495,7 -6495,7 +6613,7 @@@ msgstr " "ã¾ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -6505,7 -6505,7 +6623,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -6514,12 -6514,12 +6632,12 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 #, fuzzy #| msgid "" #| "HTTPS URIs. Cache-control and proxy options are the same as for " @@@ -6537,7 -6537,7 +6655,7 @@@ msgstr " "ãã¦ãã¾ããã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -6559,13 -6559,13 +6677,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@@ -6608,7 -6608,7 +6726,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -6624,7 -6624,7 +6742,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -6638,7 -6638,7 +6756,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -6655,12 -6655,12 +6773,12 @@@ msgstr " # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, fuzzy, no-wrap #| msgid "\"/cdrom/\"::Mount \"foo\";" msgid "/cdrom/::Mount \"foo\";" @@@ -6668,7 -6668,7 +6786,7 @@@ msgstr "\"/cdrom/\"::Mount \"foo\"; # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -6689,13 -6689,13 +6807,13 @@@ msgstr " "ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "gpgv" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -6706,18 -6706,18 +6824,18 @@@ msgstr " "ãã" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -6729,19 -6729,19 +6847,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -6758,13 -6758,13 +6876,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6779,7 -6779,7 +6897,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -6789,36 -6789,36 +6907,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -6827,7 -6827,7 +6945,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -6848,13 -6848,13 +6966,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "ãã£ã¬ã¯ããª" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -6874,7 -6874,7 +6992,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -6896,7 -6896,7 +7014,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -6911,7 -6911,7 +7029,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -6923,7 -6923,7 +7041,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@@ -6948,7 -6948,7 +7066,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6969,13 -6969,13 +7087,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "DSelect ã§ã® APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -6985,13 -6985,13 +7103,13 @@@ msgstr " "è¨å®é ç®ã§ãããã©ã«ãã®åä½ãå¶å¾¡ãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "Clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -7008,7 -7008,7 +7126,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@@ -7018,13 -7018,13 +7136,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "Updateoptions" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@@ -7033,13 -7033,13 +7151,13 @@@ msgstr " "ããã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -7049,13 -7049,13 +7167,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "APT ã dpkg ãå¼ã¶æ¹æ³" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -7065,7 -7065,7 +7183,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -7075,18 -7075,18 +7193,18 @@@ msgstr " "ããã°ãªãã¾ãããã¾ããåãªã¹ãã¯åä¸ã®å¼æ°ã¨ãã¦ &dpkg; ã«æ¸¡ããã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "Post-Invoke" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -7100,13 -7100,13 +7218,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -7122,7 -7122,7 +7240,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -7138,13 -7138,13 +7256,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "Run-Directory" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@@ -7154,13 -7154,13 +7272,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "Build-options" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@@ -7169,12 -7169,12 +7287,12 @@@ msgstr " "ã¾ããããã©ã«ãã§ã¯ç½²åãç¡å¹ã«ããå¨ãã¤ããªãçæãã¾ãã" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -7189,7 -7189,7 +7307,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -7199,7 -7199,7 +7317,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -7213,12 -7213,12 +7331,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -7231,14 -7231,14 +7349,14 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -7255,13 -7255,13 +7373,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ã¦ã¼ã¶ã®è¨å®" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -7272,12 -7272,12 +7390,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -7287,12 -7287,12 +7405,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -7304,12 -7304,12 +7422,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -7321,7 -7321,7 +7439,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -7335,12 -7335,12 +7453,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "Periodic ãªãã·ã§ã³ã¨ Archives ãªãã·ã§ã³" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -7354,12 -7354,12 +7472,12 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "ãããã°ãªãã·ã§ã³" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -7370,7 -7370,7 +7488,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -7381,7 -7381,7 +7499,7 @@@ msgstr " "ã«ãã¾ãã" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -7392,7 -7392,7 +7510,7 @@@ msgstr " "literal>) ãè¡ãå ´åã«ä½¿ç¨ãã¾ãã" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -7402,66 -7402,66 +7520,66 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ã½ã¼ã¹ã¸ã®ã¢ã¯ã»ã¹ã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "FTP ãç¨ããããã±ã¼ã¸ã®ãã¦ã³ãã¼ãã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP ãç¨ããããã±ã¼ã¸ã®ãã¦ã³ãã¼ãã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS ãç¨ããããã±ã¼ã¸ã®ãã¦ã³ãã¼ãã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -7469,46 -7469,46 +7587,46 @@@ msgstr " "<literal>gpg</literal> ãç¨ããæå·ç½²åã®æ¤è¨¼ã«é¢ããæå ±ãåºåãã¾ãã" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -7516,93 -7516,93 +7634,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -7612,12 -7612,12 +7730,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -7634,91 -7634,91 +7752,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -7726,12 -7726,12 +7844,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -7739,7 -7739,7 +7857,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -7749,7 -7749,7 +7867,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@@ -7758,7 -7758,7 +7876,7 @@@ msgstr "&apt-conf; # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -9411,7 -9411,7 +9529,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -9419,9 -9419,9 +9537,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -9683,7 -9683,7 +9801,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -9832,8 -9832,8 +9950,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -9921,7 -9921,7 +10039,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -10415,7 -10415,7 +10533,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -10550,8 -10550,8 +10668,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -10574,9 -10574,9 +10692,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" @@@ -10717,6 -10717,6 +10835,14 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" ++# type: Content of: <refentry><refsect1><para> ++#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" ++#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" ++ ++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#~ msgid "Keyring of local trusted keys, new keys will be added here." ++#~ msgstr "ãã¼ã«ã«ä¿¡é ¼ãã¼ã®ãã¼ãªã³ã°ãæ°ãããã¼ã¯ããã«è¿½å ããã¾ãã" ++ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #~ msgid "" #~ "Disable Immediate Configuration; This dangerous option disables some of " diff --cc doc/po/pl.po index 7ee8cc964,7ee8cc964..80fa40db0 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@@ -739,7 -739,7 +739,7 @@@ msgid " msgstr "" #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -749,6 -749,6 +749,29 @@@ "\">\n" msgstr "" ++#. type: Plain text ++#: apt.ent:362 ++#, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++ ++#. type: Plain text ++#: apt.ent:368 ++#, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -811,7 -811,7 +834,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 #, fuzzy @@@ -1203,7 -1203,7 +1226,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 #, fuzzy msgid "options" msgstr "Kolejne kroki" @@@ -1398,14 -1398,14 +1421,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1416,9 -1416,9 +1439,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1430,7 -1430,7 +1453,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1530,7 -1530,7 +1553,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 #, fuzzy msgid "Options" msgstr "Kolejne kroki" @@@ -1732,7 -1732,7 +1755,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@@ -2267,7 -2267,7 +2290,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2379,20 -2379,20 +2402,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2688,12 -2688,12 +2713,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2702,26 -2702,26 +2746,26 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2791,7 -2791,7 +2835,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "" @@@ -3116,15 -3116,15 +3160,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3379,7 -3379,7 +3423,7 @@@ msgstr " 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" @@@ -3595,13 -3595,13 +3639,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3609,17 -3609,17 +3654,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3627,117 -3627,117 +3672,135 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 --msgid "<filename>/etc/apt/trusted.gpg</filename>" ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 ++msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "" @@@ -4434,13 -4434,13 +4497,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -4541,13 -4541,13 +4604,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -4557,36 -4557,36 +4631,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4597,7 -4597,7 +4671,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4611,7 -4611,7 +4685,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4619,7 -4619,7 +4693,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4631,7 -4631,7 +4705,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -4641,7 -4641,7 +4715,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4649,12 -4649,12 +4723,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4664,7 -4664,7 +4738,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4685,12 -4685,12 +4759,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4709,7 -4709,7 +4783,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4719,7 -4719,7 +4793,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -4728,7 -4728,7 +4802,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4738,18 -4738,18 +4812,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4762,12 -4762,12 +4836,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4775,18 -4775,18 +4849,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4798,19 -4798,19 +4872,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4827,13 -4827,13 +4901,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4848,7 -4848,7 +4922,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4858,36 -4858,36 +4932,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4896,7 -4896,7 +4970,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -4912,12 -4912,12 +4986,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4929,7 -4929,7 +5003,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4942,7 -4942,7 +5016,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4952,7 -4952,7 +5026,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -4960,7 -4960,7 +5034,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4971,7 -4971,7 +5045,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4984,12 -4984,12 +5058,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -4997,12 -4997,12 +5071,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5013,50 -5013,50 +5087,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5064,17 -5064,17 +5138,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5083,12 -5083,12 +5157,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5098,7 -5098,7 +5172,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5108,36 -5108,36 +5182,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5152,7 -5152,7 +5226,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5162,7 -5162,7 +5236,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5176,12 -5176,12 +5250,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5193,12 -5193,12 +5267,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5214,12 -5214,12 +5288,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5230,12 -5230,12 +5304,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5245,12 -5245,12 +5319,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -5262,12 -5262,12 +5336,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5279,7 -5279,7 +5353,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5293,12 -5293,12 +5367,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5307,12 -5307,12 +5381,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5323,7 -5323,7 +5397,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5331,7 -5331,7 +5405,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5339,7 -5339,7 +5413,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5349,111 -5349,111 +5423,111 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5461,93 -5461,93 +5535,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5557,12 -5557,12 +5631,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5579,91 -5579,91 +5653,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5671,32 -5671,32 +5745,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@@ -6813,7 -6813,7 +6887,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -6821,9 -6821,9 +6895,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -7052,7 -7052,7 +7126,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7200,8 -7200,8 +7274,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -7289,7 -7289,7 +7363,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -7793,7 -7793,7 +7867,7 @@@ msgstr " #, fuzzy msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -7951,8 -7951,8 +8025,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"em>. Then take the disc to the remote machine and configure the sources." ++"list. On the remote machine execute the following:" msgstr "" "PierwszÂ± rzeczÂ±, jakÂ± naleÂ¿y zrobiÃ¦ na oddalonym komputerze z Debianem to " "zamontowaÃ¦ dysk i przekopiowaÃ¦ na niego plik /var/lib/dpkg/status. " @@@ -7981,9 -7981,9 +8055,9 @@@ msgstr " #: offline.sgml:149 #, fuzzy msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" "Polecenie dist-upgrade moÂ¿na zastÂ±piÃ¦ kaÂ¿dym innym podstawowym poleceniem " diff --cc doc/po/pt_BR.po index 331cb4d3f,331cb4d3f..6f87a3d90 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" --"POT-Creation-Date: 2009-11-27 00:18+0100\n" ++"POT-Creation-Date: 2010-01-11 15:12+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: AndrÃ© LuÃs Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@@ -782,7 -782,7 +782,7 @@@ msgid " msgstr "" #. type: Plain text --#: apt.ent:355 ++#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@@ -792,6 -792,6 +792,29 @@@ "\">\n" msgstr "" ++#. type: Plain text ++#: apt.ent:362 ++#, no-wrap ++msgid "" ++"<!ENTITY file-trustedgpg \"\n" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" ++" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" ++" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++msgstr "" ++ ++#. type: Plain text ++#: apt.ent:368 ++#, no-wrap ++msgid "" ++" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" ++" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" ++" be stored here (by other packages or the administrator).\n" ++" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" ++" </varlistentry>\n" ++"\">\n" ++msgstr "" ++ #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@@ -854,7 -854,7 +877,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 --#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 ++#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 #, fuzzy @@@ -1249,7 -1249,7 +1272,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:484 apt.conf.5.xml:506 ++#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 msgid "options" msgstr "" @@@ -1443,14 -1443,14 +1466,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 --#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 ++#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 --#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 ++#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 ++#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1461,9 -1461,9 +1484,9 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 --#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 --#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 --#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 ++#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 ++#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 ++#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@@ -1476,7 -1476,7 +1499,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 --#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 ++#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1576,7 -1576,7 +1599,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-cdrom.8.xml:91 ++#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "" @@@ -1777,7 -1777,7 +1800,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 ++#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@@ -2315,7 -2315,7 +2338,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 msgid "" --"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" ++"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" @@@ -2427,20 -2427,20 +2450,22 @@@ msgid " "variables." msgstr "" --#. type: Content of: <refentry><refsect1><refsect2><para> --#: apt-ftparchive.1.xml:351 --msgid "" --"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" --"command> performs an operation similar to:" --msgstr "" -- --#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> ++#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" ++" " ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><refsect2><para> ++#: apt-ftparchive.1.xml:351 ++msgid "" ++"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" ++"command> performs an operation similar to: <placeholder type=\"programlisting" ++"\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> @@@ -2735,12 -2735,12 +2760,31 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 --msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" ++"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " ++"packages are recompiled and/or republished with the same version again, this " ++"will lead to problems as the now outdated cached metadata like size and " ++"checksums will be used. With this option enabled this will no longer happen " ++"as it will be checked if the file was changed. Note that this option is set " ++"to \"<literal>false</literal>\" by default as it is not recommend to upload " ++"multiply versions/builds of a package with the same versionnumber, so in " ++"theory nobody will have these problems and therefore all these extra checks " ++"are useless." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-ftparchive.1.xml:559 ++msgid "<option>APT::FTPArchive::LongDescription</option>" ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> ++#: apt-ftparchive.1.xml:561 ++msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@@ -2749,27 -2749,27 +2793,27 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 ++#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:567 ++#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:563 ++#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:577 ++#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -2839,7 -2839,7 +2883,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-get.8.xml:135 apt-key.8.xml:123 ++#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "" @@@ -3164,15 -3164,15 +3208,15 @@@ msgstr " 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 " --"to deduce a likely solution. Any Package that are specified must completely " --"correct the problem. The option is sometimes necessary when 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>." ++"to deduce a likely solution. If packages are specified, these have to " ++"completely correct the problem. The option is sometimes necessary when " ++"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>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@@ -3427,7 -3427,7 +3471,7 @@@ msgstr " 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. " --"<option>remove --purge</option> is equivalent for <option>purge</option> " ++"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" @@@ -3643,13 -3643,13 +3687,14 @@@ msgstr " #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 msgid "" --"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " ++"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" ++"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:36 ++#: apt-key.8.xml:37 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 " @@@ -3657,17 -3657,17 +3702,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt-key.8.xml:42 ++#: apt-key.8.xml:43 msgid "Commands" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:44 ++#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:48 ++#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@@ -3675,119 -3675,119 +3720,139 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:56 ++#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:60 ++#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:67 ++#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:71 ++#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:78 ++#: apt-key.8.xml:79 msgid "exportall" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:82 ++#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:89 ++#: apt-key.8.xml:90 msgid "list" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:93 ++#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:100 ++#: apt-key.8.xml:101 msgid "finger" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:104 ++#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:111 ++#: apt-key.8.xml:112 msgid "adv" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:115 ++#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:127 ++#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" --#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 ++msgid "" ++"Note that options need to be defined before the commands described in the " ++"previous section." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> ++#: apt-key.8.xml:142 #, fuzzy --msgid "<filename>/etc/apt/trusted.gpg</filename>" --msgstr "<filename>/etc/apt.conf</>" ++msgid "--keyring <replaceable>filename</replaceable>" ++msgstr "" ++"<programlisting>\n" ++"apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:141 --msgid "Keyring of local trusted keys, new keys will be added here." ++#: apt-key.8.xml:143 ++msgid "" ++"With this option it is possible to specify a specific keyring file the " ++"command should operate on. The default is that a command is executed on the " ++"<filename>trusted.gpg</filename> file as well as on all parts in the " ++"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" ++"filename> is the primary keyring which means that e.g. new keys are added to " ++"this one." ++msgstr "" ++ ++#. type: Content of: <refentry><refsect1><variablelist> ++#: apt-key.8.xml:156 ++msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:144 ++#: apt-key.8.xml:158 #, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt.conf</>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:145 ++#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:148 ++#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:149 ++#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-key.8.xml:152 ++#: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-key.8.xml:153 ++#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt-key.8.xml:164 ++#: apt-key.8.xml:176 #, fuzzy msgid "&apt-get;, &apt-secure;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -4483,13 -4483,13 +4548,13 @@@ msgid " "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " --"which it is unable to perform immediate configuration, error out and refers " ++"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " --"temporary to be able to perform an install/upgrade again. Note the use of " ++"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " --"world a few times in non-stable distribution versions and caused by wrong " --"dependencies of the package in question or by a system in an already broken " --"state, so you should not blindly disable this option as the mentioned " ++"world a few times in non-stable distribution versions and was caused by " ++"wrong dependencies of the package in question or by a system in an already " ++"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@@ -4590,13 -4590,13 +4655,24 @@@ msgid " "Sources files instead of downloading whole ones. True by default." msgstr "" ++#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> ++#: apt.conf.5.xml:225 ++msgid "" ++"Two sub-options to limit the use of PDiffs are also available: With " ++"<literal>FileLimit</literal> can be specified how many PDiff files are " ++"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " ++"other hand is the maximum precentage of the size of all patches compared to " ++"the size of the targeted file. If one of these limits is exceeded the " ++"complete file is downloaded instead of the patches." ++msgstr "" ++ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:227 ++#: apt.conf.5.xml:234 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:228 ++#: apt.conf.5.xml:235 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -4606,36 -4606,36 +4682,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:235 ++#: apt.conf.5.xml:242 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:236 ++#: apt.conf.5.xml:243 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:240 ++#: apt.conf.5.xml:247 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:241 ++#: apt.conf.5.xml:248 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." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:245 sources.list.5.xml:139 ++#: apt.conf.5.xml:252 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:246 ++#: apt.conf.5.xml:253 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@@ -4646,7 -4646,7 +4722,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:254 ++#: apt.conf.5.xml:261 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@@ -4660,7 -4660,7 +4736,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:264 apt.conf.5.xml:328 ++#: apt.conf.5.xml:271 apt.conf.5.xml:335 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4668,7 -4668,7 +4744,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:267 ++#: apt.conf.5.xml:274 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@@ -4680,7 -4680,7 +4756,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:275 ++#: apt.conf.5.xml:282 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@@ -4690,7 -4690,7 +4766,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:280 ++#: apt.conf.5.xml:287 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 " @@@ -4698,12 -4698,12 +4774,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:286 ++#: apt.conf.5.xml:293 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:287 ++#: apt.conf.5.xml:294 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@@ -4713,7 -4713,7 +4789,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:293 ++#: apt.conf.5.xml:300 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4734,12 -4734,12 +4810,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:311 sources.list.5.xml:150 ++#: apt.conf.5.xml:318 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:312 ++#: apt.conf.5.xml:319 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@@ -4758,7 -4758,7 +4834,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:331 ++#: apt.conf.5.xml:338 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 " @@@ -4768,7 -4768,7 +4844,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:338 ++#: apt.conf.5.xml:345 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@@ -4777,7 -4777,7 +4853,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:343 ++#: apt.conf.5.xml:350 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4787,18 -4787,18 +4863,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:350 sources.list.5.xml:132 ++#: apt.conf.5.xml:357 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:356 ++#: apt.conf.5.xml:363 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:351 ++#: apt.conf.5.xml:358 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@@ -4811,12 -4811,12 +4887,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:361 ++#: apt.conf.5.xml:368 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:362 ++#: apt.conf.5.xml:369 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4824,18 -4824,18 +4900,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:367 ++#: apt.conf.5.xml:374 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:373 ++#: apt.conf.5.xml:380 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:368 ++#: apt.conf.5.xml:375 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4847,19 -4847,19 +4923,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:378 ++#: apt.conf.5.xml:385 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> --#: apt.conf.5.xml:381 ++#: apt.conf.5.xml:388 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:374 ++#: apt.conf.5.xml:381 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 " @@@ -4876,13 -4876,13 +4952,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:385 ++#: apt.conf.5.xml:392 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:383 ++#: apt.conf.5.xml:390 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4897,7 -4897,7 +4973,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:390 ++#: apt.conf.5.xml:397 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@@ -4907,36 -4907,36 +4983,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> --#: apt.conf.5.xml:396 ++#: apt.conf.5.xml:403 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:397 ++#: apt.conf.5.xml:404 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 " ++"Translations. APT will try to display the first available Description in 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 ++#: apt.conf.5.xml:420 #, 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 ++#: apt.conf.5.xml:410 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 " ++"<literal>LC_MESSAGES</literal> environment 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 " @@@ -4945,7 -4945,7 +5021,7 @@@ "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 " ++"the environment doesn't specify 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 " @@@ -4961,12 -4961,12 +5037,12 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:420 ++#: apt.conf.5.xml:427 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:422 ++#: apt.conf.5.xml:429 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4978,7 -4978,7 +5054,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:429 ++#: apt.conf.5.xml:436 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4991,7 -4991,7 +5067,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:438 ++#: apt.conf.5.xml:445 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -5001,7 -5001,7 +5077,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:444 ++#: apt.conf.5.xml:451 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 " @@@ -5009,7 -5009,7 +5085,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:448 ++#: apt.conf.5.xml:455 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -5020,7 -5020,7 +5096,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:456 ++#: apt.conf.5.xml:463 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -5033,12 -5033,12 +5109,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:469 ++#: apt.conf.5.xml:476 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:471 ++#: apt.conf.5.xml:478 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -5046,12 -5046,12 +5122,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:475 ++#: apt.conf.5.xml:482 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:476 ++#: apt.conf.5.xml:483 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@@ -5062,50 -5062,50 +5138,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:485 ++#: apt.conf.5.xml:492 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:489 ++#: apt.conf.5.xml:496 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:490 ++#: apt.conf.5.xml:497 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:494 ++#: apt.conf.5.xml:501 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:495 ++#: apt.conf.5.xml:502 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:501 ++#: apt.conf.5.xml:508 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:502 ++#: apt.conf.5.xml:509 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:507 ++#: apt.conf.5.xml:514 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 " @@@ -5113,17 -5113,17 +5189,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:512 ++#: apt.conf.5.xml:519 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:513 ++#: apt.conf.5.xml:520 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 " @@@ -5132,12 -5132,12 +5208,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:519 ++#: apt.conf.5.xml:526 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:520 ++#: apt.conf.5.xml:527 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 " @@@ -5147,7 -5147,7 +5223,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:526 ++#: apt.conf.5.xml:533 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5157,36 -5157,36 +5233,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:533 ++#: apt.conf.5.xml:540 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:534 ++#: apt.conf.5.xml:541 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:538 ++#: apt.conf.5.xml:545 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:539 ++#: apt.conf.5.xml:546 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> --#: apt.conf.5.xml:544 ++#: apt.conf.5.xml:551 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:545 ++#: apt.conf.5.xml:552 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@@ -5201,7 -5201,7 +5277,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> --#: apt.conf.5.xml:560 ++#: apt.conf.5.xml:567 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5211,7 -5211,7 +5287,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> --#: apt.conf.5.xml:554 ++#: apt.conf.5.xml:561 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 " @@@ -5225,12 -5225,12 +5301,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:566 ++#: apt.conf.5.xml:573 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:567 ++#: apt.conf.5.xml:574 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 " @@@ -5242,12 -5242,12 +5318,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:574 ++#: apt.conf.5.xml:581 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:575 ++#: apt.conf.5.xml:582 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5263,12 -5263,12 +5339,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:585 ++#: apt.conf.5.xml:592 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:586 ++#: apt.conf.5.xml:593 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5279,12 -5279,12 +5355,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:592 ++#: apt.conf.5.xml:599 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:593 ++#: apt.conf.5.xml:600 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5294,12 -5294,12 +5370,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:598 ++#: apt.conf.5.xml:605 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:599 ++#: apt.conf.5.xml:606 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@@ -5311,12 -5311,12 +5387,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> --#: apt.conf.5.xml:606 ++#: apt.conf.5.xml:613 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> --#: apt.conf.5.xml:614 ++#: apt.conf.5.xml:621 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5328,7 -5328,7 +5404,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:607 ++#: apt.conf.5.xml:614 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@@ -5342,12 -5342,12 +5418,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:627 ++#: apt.conf.5.xml:634 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:628 ++#: apt.conf.5.xml:635 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5356,12 -5356,12 +5432,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> --#: apt.conf.5.xml:636 ++#: apt.conf.5.xml:643 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:638 ++#: apt.conf.5.xml:645 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5372,7 -5372,7 +5448,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:649 ++#: apt.conf.5.xml:656 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5380,7 -5380,7 +5456,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:657 ++#: apt.conf.5.xml:664 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5388,7 -5388,7 +5464,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:666 ++#: apt.conf.5.xml:673 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5398,120 -5398,120 +5474,120 @@@ msgstr " #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> --#: apt.conf.5.xml:674 ++#: apt.conf.5.xml:681 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:684 ++#: apt.conf.5.xml:691 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:689 ++#: apt.conf.5.xml:696 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:693 ++#: apt.conf.5.xml:700 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:700 ++#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:704 ++#: apt.conf.5.xml:711 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:711 ++#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:715 ++#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:722 ++#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:726 ++#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:733 ++#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:737 ++#: apt.conf.5.xml:744 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:744 ++#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:748 ++#: apt.conf.5.xml:755 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:755 ++#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:758 ++#: apt.conf.5.xml:765 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:765 ++#: apt.conf.5.xml:772 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:768 ++#: apt.conf.5.xml:775 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:775 ++#: apt.conf.5.xml:782 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:778 ++#: apt.conf.5.xml:785 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 " @@@ -5519,99 -5519,99 +5595,99 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:786 ++#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:789 ++#: apt.conf.5.xml:796 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:797 ++#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:801 ++#: apt.conf.5.xml:808 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:808 ++#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:811 ++#: apt.conf.5.xml:818 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:818 ++#: apt.conf.5.xml:825 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:821 ++#: apt.conf.5.xml:828 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:829 ++#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:833 ++#: apt.conf.5.xml:840 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:840 ++#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:844 ++#: apt.conf.5.xml:851 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:851 ++#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:855 ++#: apt.conf.5.xml:862 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:862 ++#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:865 ++#: apt.conf.5.xml:872 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5621,12 -5621,12 +5697,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:876 ++#: apt.conf.5.xml:883 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:879 ++#: apt.conf.5.xml:886 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5643,96 -5643,96 +5719,96 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:898 ++#: apt.conf.5.xml:905 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:901 ++#: apt.conf.5.xml:908 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:908 ++#: apt.conf.5.xml:915 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:911 ++#: apt.conf.5.xml:918 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:919 ++#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:922 ++#: apt.conf.5.xml:929 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:929 ++#: apt.conf.5.xml:936 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:933 ++#: apt.conf.5.xml:940 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:941 ++#: apt.conf.5.xml:948 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:945 ++#: apt.conf.5.xml:952 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:952 ++#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:956 ++#: apt.conf.5.xml:963 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:962 ++#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:966 ++#: apt.conf.5.xml:973 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:974 ++#: apt.conf.5.xml:981 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:977 ++#: apt.conf.5.xml:984 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 " @@@ -5740,33 -5740,33 +5816,33 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt.conf.5.xml:985 ++#: apt.conf.5.xml:992 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt.conf.5.xml:989 ++#: apt.conf.5.xml:996 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1012 ++#: apt.conf.5.xml:1019 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> --#: apt.conf.5.xml:1019 ++#: apt.conf.5.xml:1026 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> --#: apt.conf.5.xml:1024 ++#: apt.conf.5.xml:1031 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -7299,7 -7299,7 +7375,7 @@@ msgstr " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 --msgid "more recongnizable URI types" ++msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> @@@ -7307,9 -7307,9 +7383,9 @@@ msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" --"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " ++"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " --"access methods for https-URIs with features similiar to the http method, but " ++"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@@ -7526,7 -7526,7 +7602,7 @@@ msgstr " #: guide.sgml:63 msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " --"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " ++"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 "" @@@ -7674,8 -7674,8 +7750,8 @@@ msgstr " #. type: #: guide.sgml:184 msgid "" --"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" --"prgn> and then choose the APT method. You will be prompted for a set of " ++"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 " "Sources which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@@ -7763,7 -7763,7 +7839,7 @@@ msgstr " #: guide.sgml:247 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 super-set of " ++"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." @@@ -8241,7 -8241,7 +8317,7 @@@ msgstr " #: offline.sgml:57 msgid "" "This is achieved by creatively manipulating the APT configuration file. The " --"essential premis to tell APT to look on a disc for it's archive files. Note " ++"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." msgstr "" @@@ -8339,8 -8339,8 +8415,8 @@@ msgid " "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/</" --"em> Then take the disc to the remote machine and configure the sources.list. " --"On the remote machine execute the following:" ++"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> @@@ -8357,9 -8357,9 +8433,9 @@@ msgstr " #. type: </example> #: offline.sgml:149 msgid "" --"The dist-upgrade command can be replaced with any-other standard APT " ++"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 dselect However this presents a problem in communicating " ++"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" @@@ -8491,6 -8491,6 +8567,10 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" ++#, fuzzy ++#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" ++#~ msgstr "<filename>/etc/apt.conf</>" ++ #, fuzzy #~ msgid "/usr/share/doc/apt/" #~ msgstr "/usr/share/doc/apt/"