X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6c1f5d2c3c8df164e78dda8f24d28667634403e1..6cbb88de9417ce776e3488cf3495eb8fed3efe0c:/doc/po/apt-doc.pot diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index ae1a6acf8..6501cc271 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -1,13 +1,14 @@ # SOME DESCRIPTIVE TITLE # Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the apt-doc package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-05-21 07:56+0300\n" +"Project-Id-Version: apt-doc 0.9.5.1\n" +"Report-Msgid-Bugs-To: APT Development Team \n" +"POT-Creation-Date: 2012-05-29 15:35+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +32,7 @@ msgstr "" #. type: TH #: apt.8:17 #, no-wrap -msgid "Debian GNU/Linux" +msgid "Debian" msgstr "" #. type: SH @@ -308,7 +309,7 @@ msgid "" " Storage area for package files in transit.\n" " Configuration Item: Dir::Cache::Archives " "(partial will be implicitly " -"appended). \n" +"appended)\n" " \n" "\">\n" msgstr "" @@ -390,7 +391,7 @@ msgid "" " Storage area for state information in transit.\n" " Configuration Item: Dir::State::Lists " "(partial will be implicitly " -"appended).\n" +"appended)\n" " \n" "\">\n" msgstr "" @@ -610,7 +611,7 @@ msgid "8" msgstr "" #. type: Content of: -#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27 apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26 apt-sortpkgs.1.xml:27 apt.conf.5.xml:31 apt_preferences.5.xml:26 sources.list.5.xml:27 +#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27 apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26 apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26 sources.list.5.xml:27 msgid "APT" msgstr "" @@ -620,7 +621,7 @@ msgid "query the APT cache" msgstr "" #. type: Content of: -#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38 apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38 apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50 apt-sortpkgs.1.xml:38 apt.conf.5.xml:40 apt_preferences.5.xml:36 sources.list.5.xml:36 +#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38 apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38 apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50 apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36 sources.list.5.xml:36 msgid "Description" msgstr "" @@ -634,7 +635,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:44 apt-get.8.xml:44 +#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44 apt-ftparchive.1.xml:54 apt-get.8.xml:44 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -648,7 +649,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable> -#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208 apt-cache.8.xml:226 apt-cache.8.xml:238 +#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206 apt-cache.8.xml:224 apt-cache.8.xml:236 msgid "&synopsis-pkg;" msgstr "" @@ -723,9 +724,9 @@ msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " "virtual package name, and no package actually uses the name. For instance, " -"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual " -"package; several packages provide \"mail-transport-agent\", but there is no " -"package named \"mail-transport-agent\"." +"\"mail-transport-agent\" in the Debian system is a pure virtual package; " +"several packages provide \"mail-transport-agent\", but there is no package " +"named \"mail-transport-agent\"." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@ -733,8 +734,8 @@ msgstr "" msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " -"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " -"one package, xless, provides \"X11-text-viewer\"." +"Debian system, \"X11-text-viewer\" is a virtual package, but only one " +"package, xless, provides \"X11-text-viewer\"." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@ -742,9 +743,8 @@ msgstr "" msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " -"as the package name. For instance, in the Debian GNU/Linux system, " -"\"debconf\" is both an actual package, and provided by the debconf-tiny " -"package." +"as the package name. For instance, in the Debian system, \"debconf\" is both " +"an actual package, and provided by the debconf-tiny package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@ -762,9 +762,9 @@ msgstr "" msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " -"total package names. If more than one distribution (both \"stable\" and " -"\"unstable\", for instance), is being accessed, this value can be " -"considerably larger than the number of total package names." +"total package names. If more than one distribution is being accessed (for " +"instance, \"stable\" and \"unstable\"), this value can be considerably " +"larger than the number of total package names." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> @@ -779,7 +779,7 @@ msgstr "" msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " -"records that declare the name to be a Binary." +"records that declare the name to be a binary package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -820,45 +820,43 @@ msgstr "" #: apt-cache.8.xml:170 msgid "" "<literal>search</literal> performs a full text search on all available " -"package lists for the POSIX regex pattern given, see " -"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " -"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and " -"the descriptions for an occurrence of the regular expression and prints out " -"the package name and the short description, including virtual package " -"names. If <option>--full</option> is given then output identical to " -"<literal>show</literal> is produced for each matched package, and if " -"<option>--names-only</option> is given then the long description is not " -"searched, only the package name is." +"package lists for the POSIX regex pattern given, see ®ex;. It searches " +"the package names and the descriptions for an occurrence of the regular " +"expression and prints out the package name and the short description, " +"including virtual package names. If <option>--full</option> is given then " +"output identical to <literal>show</literal> is produced for each matched " +"package, and if <option>--names-only</option> is given then the long " +"description is not searched, only the package name is." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:183 +#: apt-cache.8.xml:181 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:188 +#: apt-cache.8.xml:186 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:193 +#: apt-cache.8.xml:191 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:197 +#: apt-cache.8.xml:195 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:198 +#: apt-cache.8.xml:196 msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -868,7 +866,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:203 +#: apt-cache.8.xml:201 msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -876,7 +874,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:209 +#: apt-cache.8.xml:207 msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink " @@ -889,21 +887,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:218 +#: apt-cache.8.xml:216 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " -"pure provides are triangles, mixed provides are diamonds, missing packages " -"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " -"lines are pre-depends, green lines are conflicts." +"pure virtual packages are triangles, mixed virtual packages are diamonds, " +"missing packages are hexagons. Orange boxes mean recursion was stopped (leaf " +"packages), blue lines are pre-depends, green lines are conflicts." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:223 +#: apt-cache.8.xml:221 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:227 +#: apt-cache.8.xml:225 msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink " "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG " @@ -911,12 +909,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:231 +#: apt-cache.8.xml:229 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:232 +#: apt-cache.8.xml:230 msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -925,7 +923,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:239 +#: apt-cache.8.xml:237 msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -937,12 +935,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48 +#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48 msgid "options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:255 +#: apt-cache.8.xml:253 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: " @@ -950,7 +948,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:261 +#: apt-cache.8.xml:259 msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -960,7 +958,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:269 +#: apt-cache.8.xml:267 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -969,15 +967,15 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:276 +#: apt-cache.8.xml:274 msgid "" -"Print only important dependencies; for use with unmet and depends. Causes " -"only Depends and Pre-Depends relations to be printed. Configuration Item: " -"<literal>APT::Cache::Important</literal>." +"Print only important dependencies; for use with <literal>unmet</literal> and " +"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to " +"be printed. Configuration Item: <literal>APT::Cache::Important</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:288 msgid "" "Per default the <literal>depends</literal> and <literal>rdepends</literal> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -987,25 +985,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:296 +#: apt-cache.8.xml:295 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:301 +#: apt-cache.8.xml:300 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If " "<option>--no-all-versions</option> is specified, only the candidate version " -"will displayed (the one which would be selected for installation). This " +"will be displayed (the one which would be selected for installation). This " "option is only applicable to the <literal>show</literal> command. " "Configuration Item: <literal>APT::Cache::AllVersions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:310 +#: apt-cache.8.xml:309 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use " @@ -1014,14 +1012,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:316 +#: apt-cache.8.xml:315 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:321 +#: apt-cache.8.xml:320 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: " @@ -1029,7 +1027,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:327 +#: apt-cache.8.xml:326 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1037,45 +1035,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:333 msgid "" "Limit the output of <literal>depends</literal> and " "<literal>rdepends</literal> to packages which are currently installed. " "Configuration Item: <literal>APT::Cache::Installed</literal>." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58 -msgid "&apt-commonoptions;" -msgstr "" - #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126 apt.conf.5.xml:1117 apt_preferences.5.xml:698 +#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1118 apt_preferences.5.xml:698 msgid "Files" msgstr "" -#. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:346 -msgid "&file-sourceslist; &file-statelists;" -msgstr "" - #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1123 apt_preferences.5.xml:705 sources.list.5.xml:255 +#: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252 msgid "See Also" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:352 +#: apt-cache.8.xml:351 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67 +#: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:135 apt-sortpkgs.1.xml:67 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:357 +#: apt-cache.8.xml:356 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -1083,13 +1071,13 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-cdrom.8.xml:32 -msgid "APT CDROM management utility" +msgid "APT CD-ROM management utility" msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:38 msgid "" -"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " +"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of " "available sources. <command>apt-cdrom</command> takes care of determining " "the structure of the disc as well as correcting for several possible " "mis-burns and verifying the index files." @@ -1099,66 +1087,58 @@ msgstr "" #: apt-cdrom.8.xml:45 msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " -"system, it cannot be done by hand. Furthermore each disk in a multi-cd set " +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:56 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then proceed " +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " -"<filename>disk</filename> directory you will be prompted for a descriptive " +"<filename>.disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:64 msgid "" -"APT uses a CDROM ID to track which disc is currently in the drive and " +"APT uses a CD-ROM ID to track which disc is currently in the drive and " "maintains a database of these IDs in " "<filename>&statedir;/cdroms.list</filename>" msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:72 msgid "" "A debugging tool to report the identity of the current disc as well as the " "stored file name" msgstr "" -#. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:51 -msgid "" -"Unless the <option>-h</option>, or <option>--help</option> option is given " -"one of the commands below must be present. <placeholder " -"type=\"variablelist\" id=\"0\"/>" -msgstr "" - #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:81 apt-key.8.xml:160 +#: apt-cdrom.8.xml:80 apt-key.8.xml:160 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:86 +#: apt-cdrom.8.xml:85 msgid "" -"Mount point; specify the location to mount the cdrom. This mount point must " +"Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " "Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:95 +#: apt-cdrom.8.xml:94 msgid "" -"Rename a disc; change the label of a disk or override the disks given " +"Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " "new label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:104 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: " @@ -1166,7 +1146,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:112 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -1175,7 +1155,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:122 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -1183,7 +1163,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:133 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -1191,12 +1171,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:146 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:151 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -1213,14 +1193,7 @@ msgid "" "<command>apt-config</command> is an internal program used by various " "portions of the APT suite to provide consistent configurability. It accesses " "the main configuration file <filename>/etc/apt/apt.conf</filename> in a " -"manner that is easy to use by scripted applications." -msgstr "" - -#. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:44 apt-ftparchive.1.xml:54 -msgid "" -"Unless the <option>-h</option>, or <option>--help</option> option is given " -"one of the commands below must be present." +"manner that is easy to use for scripted applications." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1228,9 +1201,9 @@ msgstr "" msgid "" "shell is used to access the configuration information from a shell " "script. It is given pairs of arguments, the first being a shell variable and " -"the second the configuration value to query. As output it lists a series of " -"shell assignments commands for each present value. In a shell script it " -"should be used like:" +"the second the configuration value to query. As output it lists shell " +"assignment commands for each value present. In a shell script it should be " +"used as follows:" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> @@ -1278,12 +1251,11 @@ msgstr "" #: apt-config.8.xml:96 msgid "" "Defines the output of each config option. %t will be replaced with " -"the name of the option, %f with the complete optionname and %v " -"with the value of the option. Use uppercase letters and special characters " -"in the value will be encoded to ensure that it can e.g. be savely used in a " -"quoted-string as defined by RFC822. Additionally %n will be replaced " -"by a newline, %N by a tab. A % can be printed by using " -"%%." +"its individual name, %f with its full hierarchical name and %v " +"with its value. Use uppercase letters and special characters in the value " +"will be encoded to ensure that it can e.g. be safely used in a quoted-string " +"as defined by RFC822. Additionally %n will be replaced by a newline, " +"and %N by a tab. A % can be printed by using %%." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -1305,7 +1277,9 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-extracttemplates.1.xml:33 -msgid "Utility to extract DebConf config and templates from Debian packages" +msgid "" +"Utility to extract <command>debconf</command> config and templates from " +"Debian packages" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -1336,8 +1310,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:58 msgid "" -"Temporary directory in which to write extracted debconf template files and " -"config scripts. Configuration Item: " +"Temporary directory in which to write extracted <command>debconf</command> " +"template files and config scripts. Configuration Item: " "<literal>APT::ExtractTemplates::TempDir</literal>" msgstr "" @@ -1494,7 +1468,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:144 -msgid "Dir Section" +msgid "<literal>Dir</literal> Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -1533,7 +1507,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:176 -msgid "Default Section" +msgid "<literal>Default</literal> Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -1612,7 +1586,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:242 -msgid "TreeDefault Section" +msgid "<literal>TreeDefault</literal> Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -1727,7 +1701,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:342 -msgid "Tree Section" +msgid "<literal>Tree</literal> Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -1817,7 +1791,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:410 -msgid "BinDirectory Section" +msgid "<literal>BinDirectory</literal> Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -2036,7 +2010,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1111 apt_preferences.5.xml:545 sources.list.5.xml:214 +#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211 msgid "Examples" msgstr "" @@ -2111,17 +2085,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:74 msgid "" -"<literal>dselect-upgrade</literal> is used in conjunction with the " -"traditional Debian packaging front-end, " -"&dselect;. <literal>dselect-upgrade</literal> follows the changes made by " -"&dselect; to the <literal>Status</literal> field of available packages, and " -"performs the actions necessary to realize that state (for instance, the " -"removal of old and the installation of new packages)." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:84 -msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " "with new versions of packages; <command>apt-get</command> has a \"smart\" " @@ -2133,20 +2096,31 @@ msgid "" "for a mechanism for overriding the general settings for individual packages." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:87 +msgid "" +"<literal>dselect-upgrade</literal> is used in conjunction with the " +"traditional Debian packaging front-end, " +"&dselect;. <literal>dselect-upgrade</literal> follows the changes made by " +"&dselect; to the <literal>Status</literal> field of available packages, and " +"performs the actions necessary to realize that state (for instance, the " +"removal of old and the installation of new packages)." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:98 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " -"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would " -"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " -"packages required by the package(s) specified for installation will also be " -"retrieved and installed. The <filename>/etc/apt/sources.list</filename> " -"file is used to locate the desired packages. If a hyphen is appended to the " -"package name (with no intervening space), the identified package will be " -"removed if it is installed. Similarly a plus sign can be used to designate " -"a package to install. These latter features may be used to override " -"decisions made by apt-get's conflict resolution system." +"qualified filename (for instance, in a Debian system, libc6 would be the " +"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages " +"required by the package(s) specified for installation will also be retrieved " +"and installed. The <filename>/etc/apt/sources.list</filename> file is used " +"to locate the desired packages. If a hyphen is appended to the package name " +"(with no intervening space), the identified package will be removed if it is " +"installed. Similarly a plus sign can be used to designate a package to " +"install. These latter features may be used to override decisions made by " +"apt-get's conflict resolution system." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2642,13 +2616,6 @@ msgid "" "<literal>APT::Get::AllowUnauthenticated</literal>." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:521 -msgid "" -"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " -"&file-statelists;" -msgstr "" - #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:530 msgid "" @@ -2761,11 +2728,6 @@ msgid "" "e.g. new keys are added to this one." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:177 -msgid "&file-trustedgpg;" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:179 msgid "<filename>/etc/apt/trustdb.gpg</filename>" @@ -2880,33 +2842,17 @@ msgid "" "the same way as for the other show commands." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename> -#: apt-mark.8.xml:112 apt-mark.8.xml:113 -msgid "<replaceable>&synopsis-filename;</replaceable>" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:115 msgid "" "Read/Write package stats from the filename given with the parameter " -"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead " -"of from the default location, which is <filename>extended_status</filename> " -"in the directory defined by the Configuration Item: " -"<literal>Dir::State</literal>." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:128 -msgid " &file-extended_states;" -msgstr "" - -#. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:133 -msgid "&apt-get;,&aptitude;,&apt-conf;" +"&synopsis-param-filename; instead of from the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:137 +#: apt-mark.8.xml:136 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -3172,18 +3118,23 @@ msgstr "" msgid "Initial documentation of Debug::*." msgstr "" +#. type: Content of: <refentry><refentryinfo><author><email> +#: apt.conf.5.xml:21 +msgid "dburrows@debian.org" +msgstr "" + #. type: Content of: <refentry><refmeta><manvolnum> -#: apt.conf.5.xml:30 apt_preferences.5.xml:25 sources.list.5.xml:26 +#: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26 msgid "5" msgstr "" #. type: Content of: <refentry><refnamediv><refpurpose> -#: apt.conf.5.xml:37 +#: apt.conf.5.xml:38 msgid "Configuration file for APT" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:41 +#: apt.conf.5.xml:42 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " "suite of tools, but by far not the only place changes to options can be " @@ -3192,21 +3143,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><para> -#: apt.conf.5.xml:46 +#: apt.conf.5.xml:47 msgid "" "When an APT tool starts up it will read the configuration files in the " "following order:" msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> -#: apt.conf.5.xml:48 +#: apt.conf.5.xml:49 msgid "" "the file specified by the <envar>APT_CONFIG</envar> environment variable (if " "any)" msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:51 msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " "order which have either no or \"<literal>conf</literal>\" as filename " @@ -3218,24 +3169,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> -#: apt.conf.5.xml:57 +#: apt.conf.5.xml:58 msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>" msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> -#: apt.conf.5.xml:59 +#: apt.conf.5.xml:60 msgid "" "the command line options are applied to override the configuration " "directives or to load even more configuration files." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:63 +#: apt.conf.5.xml:64 msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:64 +#: apt.conf.5.xml:65 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -3245,7 +3196,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:71 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -3261,7 +3212,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:84 +#: apt.conf.5.xml:85 #, no-wrap msgid "" "APT {\n" @@ -3273,7 +3224,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:92 +#: apt.conf.5.xml:93 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -3282,13 +3233,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:97 +#: apt.conf.5.xml:98 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:100 +#: apt.conf.5.xml:101 msgid "" "In general the sample configuration file in " "<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good " @@ -3296,14 +3247,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:104 +#: apt.conf.5.xml:105 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:107 +#: apt.conf.5.xml:108 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example " @@ -3313,7 +3264,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:112 +#: apt.conf.5.xml:113 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and " @@ -3325,7 +3276,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:120 +#: apt.conf.5.xml:121 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will " @@ -3335,7 +3286,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:125 +#: apt.conf.5.xml:126 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -3346,7 +3297,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:132 +#: apt.conf.5.xml:133 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -3363,19 +3314,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:144 +#: apt.conf.5.xml:145 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:145 +#: apt.conf.5.xml:146 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:150 +#: apt.conf.5.xml:151 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -3383,7 +3334,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:156 +#: apt.conf.5.xml:157 msgid "" "All Architectures the system supports. Processors implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction " @@ -3396,7 +3347,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:167 msgid "" "Default release to install packages from if more than one version " "available. Contains release name, codename or release version. Examples: " @@ -3405,14 +3356,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:172 +#: apt.conf.5.xml:173 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:177 +#: apt.conf.5.xml:178 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3421,7 +3372,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:185 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -3454,7 +3405,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:208 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a " @@ -3465,7 +3416,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:217 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -3486,38 +3437,45 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:233 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:237 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:242 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 +#: apt.conf.5.xml:247 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:252 +#: apt.conf.5.xml:253 msgid "The Acquire Group" msgstr "" +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:254 +msgid "" +"The <literal>Acquire</literal> group of options controls the download of " +"packages and the URI handlers." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:258 +#: apt.conf.5.xml:259 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -3529,7 +3487,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:269 +#: apt.conf.5.xml:270 msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the <literal>Date</literal> header). If the Release file " @@ -3541,7 +3499,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:281 msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the <literal>Date</literal> header). Use this if you " @@ -3552,14 +3510,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:292 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "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:294 +#: apt.conf.5.xml:295 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 " @@ -3570,7 +3528,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:305 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -3580,21 +3538,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:313 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><listitem><para> -#: apt.conf.5.xml:317 +#: apt.conf.5.xml:318 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><listitem><para> -#: apt.conf.5.xml:322 +#: apt.conf.5.xml:323 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 " @@ -3606,7 +3564,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:331 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 " @@ -3620,7 +3578,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:340 apt.conf.5.xml:406 +#: apt.conf.5.xml:341 apt.conf.5.xml:407 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -3628,7 +3586,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 +#: apt.conf.5.xml:344 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial " @@ -3640,14 +3598,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:351 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow " "redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:353 +#: apt.conf.5.xml:354 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -3657,7 +3615,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:359 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 " @@ -3665,7 +3623,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:365 +#: apt.conf.5.xml:366 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -3675,7 +3633,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:372 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -3697,7 +3655,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:391 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 " @@ -3717,7 +3675,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:409 +#: apt.conf.5.xml:410 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 " @@ -3727,7 +3685,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:417 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -3737,7 +3695,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:422 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -3747,16 +3705,16 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:434 +#: apt.conf.5.xml:435 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:430 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 " +"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, " +"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM " "drive as specified in <filename>/etc/fstab</filename>. It is possible to " "provide alternate mount and unmount commands if your mount point cannot be " "listed in the fstab (such as an SMB mount and old mount packages). The " @@ -3766,7 +3724,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:441 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -3774,7 +3732,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:452 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -3782,7 +3740,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:446 +#: apt.conf.5.xml:447 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -3794,19 +3752,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:460 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:452 +#: apt.conf.5.xml:453 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 " @@ -3823,13 +3781,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:464 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:462 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -3844,7 +3802,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:468 +#: apt.conf.5.xml:469 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -3852,7 +3810,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:475 +#: apt.conf.5.xml:476 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -3861,7 +3819,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:484 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -3874,13 +3832,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:499 +#: apt.conf.5.xml:500 #, 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:489 +#: apt.conf.5.xml:490 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " @@ -3903,7 +3861,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:501 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -3912,21 +3870,13 @@ msgid "" "\"<literal>none</literal>\")." msgstr "" -#. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:253 -msgid "" -"The <literal>Acquire</literal> group of options controls the download of " -"packages and the URI handlers. <placeholder type=\"variablelist\" " -"id=\"0\"/>" -msgstr "" - #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:512 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:514 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -3938,7 +3888,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:521 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -3951,7 +3901,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:529 +#: apt.conf.5.xml:530 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -3961,7 +3911,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:535 +#: apt.conf.5.xml:536 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 " @@ -3969,7 +3919,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:540 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -3981,7 +3931,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:548 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -3994,7 +3944,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:561 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4005,12 +3955,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:570 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:572 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4018,7 +3968,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:577 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 " @@ -4029,40 +3979,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:585 +#: apt.conf.5.xml:586 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><listitem><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:591 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><listitem><para> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:596 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:601 +#: apt.conf.5.xml:602 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:603 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:607 +#: apt.conf.5.xml:608 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 " @@ -4070,7 +4020,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:614 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 " @@ -4079,7 +4029,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:621 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 " @@ -4089,7 +4039,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:627 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4100,26 +4050,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:635 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:639 +#: apt.conf.5.xml:640 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:644 +#: apt.conf.5.xml:645 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:646 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -4134,7 +4084,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:660 +#: apt.conf.5.xml:661 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4144,7 +4094,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:655 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 " @@ -4158,7 +4108,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:668 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 " @@ -4170,7 +4120,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:676 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -4187,7 +4137,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:687 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -4199,7 +4149,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:693 +#: apt.conf.5.xml:694 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -4209,7 +4159,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:700 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 " @@ -4221,7 +4171,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:715 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4233,7 +4183,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:708 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 " @@ -4247,12 +4197,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:728 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:728 +#: apt.conf.5.xml:729 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -4261,12 +4211,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:736 +#: apt.conf.5.xml:737 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:738 +#: apt.conf.5.xml:739 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4277,7 +4227,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:749 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -4285,7 +4235,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:757 +#: apt.conf.5.xml:758 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -4293,7 +4243,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:766 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4303,65 +4253,65 @@ 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:774 +#: apt.conf.5.xml:775 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " -"in CDROM IDs." +"in CD-ROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:784 +#: apt.conf.5.xml:785 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:794 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:805 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:816 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:827 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:838 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:849 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:859 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:868 +#: apt.conf.5.xml:869 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:879 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 " @@ -4369,52 +4319,52 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:889 +#: apt.conf.5.xml:890 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><listitem><para> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:902 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:912 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:921 +#: apt.conf.5.xml:922 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><listitem><para> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:934 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><listitem><para> -#: apt.conf.5.xml:944 +#: apt.conf.5.xml:945 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:956 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><listitem><para> -#: apt.conf.5.xml:965 +#: apt.conf.5.xml:966 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -4424,7 +4374,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:979 +#: apt.conf.5.xml:980 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -4442,50 +4392,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1001 +#: apt.conf.5.xml:1002 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1011 +#: apt.conf.5.xml:1012 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><listitem><para> -#: apt.conf.5.xml:1022 +#: apt.conf.5.xml:1023 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><listitem><para> -#: apt.conf.5.xml:1033 +#: apt.conf.5.xml:1034 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><listitem><para> -#: apt.conf.5.xml:1045 +#: apt.conf.5.xml:1046 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1056 +#: apt.conf.5.xml:1057 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1066 +#: apt.conf.5.xml:1067 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><listitem><para> -#: apt.conf.5.xml:1077 +#: apt.conf.5.xml:1078 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 " @@ -4493,27 +4443,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1089 +#: apt.conf.5.xml:1090 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:1112 +#: apt.conf.5.xml:1113 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" -#. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1119 -msgid "&file-aptconf;" -msgstr "" - #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1124 +#: apt.conf.5.xml:1125 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -4617,6 +4562,13 @@ msgid "" "id=\"1\"/>" msgstr "" +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:101 +msgid "" +"If the target release has been specified then APT uses the following " +"algorithm to set the priorities of the versions of a package. Assign:" +msgstr "" + #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:106 msgid "priority 1" @@ -4667,14 +4619,6 @@ msgstr "" msgid "to the versions that are not installed and belong to the target release." msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:101 -msgid "" -"If the target release has been specified then APT uses the following " -"algorithm to set the priorities of the versions of a package. Assign: " -"<placeholder type=\"variablelist\" id=\"0\"/>" -msgstr "" - #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:132 msgid "" @@ -4952,6 +4896,13 @@ msgstr "" msgid "How APT Interprets Priorities" msgstr "" +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:310 +msgid "" +"Priorities (P) assigned in the APT preferences file must be positive or " +"negative integers. They are interpreted as follows (roughly speaking):" +msgstr "" + #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:315 msgid "P > 1000" @@ -5022,14 +4973,6 @@ msgstr "" msgid "prevents the version from being installed" msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:310 -msgid "" -"Priorities (P) assigned in the APT preferences file must be positive or " -"negative integers. They are interpreted as follows (roughly speaking): " -"<placeholder type=\"variablelist\" id=\"0\"/>" -msgstr "" - #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:349 msgid "" @@ -5108,6 +5051,18 @@ msgid "" "describe the packages available at that location." msgstr "" +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:399 +msgid "" +"The <filename>Packages</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " +"for example, " +"<filename>.../dists/stable/main/binary-i386/Packages</filename>. It " +"consists of a series of multi-line records, one for each package available " +"in that directory. Only two lines in each record are relevant for setting " +"APT priorities:" +msgstr "" + #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:407 msgid "the <literal>Package:</literal> line" @@ -5129,15 +5084,16 @@ msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:399 +#: apt_preferences.5.xml:417 msgid "" -"The <filename>Packages</filename> file is normally found in the directory " -"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " -"for example, " -"<filename>.../dists/stable/main/binary-i386/Packages</filename>. It " -"consists of a series of multi-line records, one for each package available " -"in that directory. Only two lines in each record are relevant for setting " -"APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" +"The <filename>Release</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " +"example, <filename>.../dists/stable/Release</filename>, or " +"<filename>.../dists/&stable-codename;/Release</filename>. It consists of a " +"single multi-line record which applies to <emphasis>all</emphasis> of the " +"packages in the directory tree below its parent. Unlike the " +"<filename>Packages</filename> file, nearly all of the lines in a " +"<filename>Release</filename> file are relevant for setting APT priorities:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> @@ -5188,8 +5144,8 @@ msgstr "" #: apt_preferences.5.xml:462 msgid "" "names the release version. For example, the packages in the tree might " -"belong to Debian GNU/Linux release version 3.0. Note that there is normally " -"no version number for the <literal>testing</literal> and " +"belong to Debian release version 3.0. Note that there is normally no " +"version number for the <literal>testing</literal> and " "<literal>unstable</literal> distributions because they have not been " "released yet. Specifying this in the APT preferences file would require one " "of the following lines." @@ -5267,20 +5223,6 @@ msgstr "" msgid "Pin: release l=Debian\n" msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:417 -msgid "" -"The <filename>Release</filename> file is normally found in the directory " -"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " -"example, <filename>.../dists/stable/Release</filename>, or " -"<filename>.../dists/&stable-codename;/Release</filename>. It consists of a " -"single multi-line record which applies to <emphasis>all</emphasis> of the " -"packages in the directory tree below its parent. Unlike the " -"<filename>Packages</filename> file, nearly all of the lines in a " -"<filename>Release</filename> file are relevant for setting APT priorities: " -"<placeholder type=\"variablelist\" id=\"0\"/>" -msgstr "" - #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:523 msgid "" @@ -5501,11 +5443,6 @@ msgid "" "version. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" -#. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:700 -msgid "&file-preferences;" -msgstr "" - #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:706 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -5521,8 +5458,8 @@ msgstr "" msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " -"documents only the packaging system used by the Debian GNU/Linux system. " -"This control file is <filename>/etc/apt/sources.list</filename>." +"documents only the packaging system used by the Debian system. This control " +"file is <filename>/etc/apt/sources.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -5691,39 +5628,29 @@ msgstr "" msgid "URI specification" msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:146 -msgid "file" +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:143 +msgid "The currently recognized URI types are:" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:148 +#: sources.list.5.xml:147 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " "archives." msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:153 -msgid "cdrom" -msgstr "" - #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:155 +#: sources.list.5.xml:154 msgid "" -"The cdrom scheme allows APT to use a local CDROM drive with media " +"The cdrom scheme allows APT to use a local CD-ROM drive with media " "swapping. Use the &apt-cdrom; program to create cdrom entries in the source " "list." msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:160 -msgid "http" -msgstr "" - #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:162 +#: sources.list.5.xml:161 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format " @@ -5733,13 +5660,8 @@ msgid "" "method of authentication." msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:171 -msgid "ftp" -msgstr "" - #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:173 +#: sources.list.5.xml:172 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual " @@ -5750,31 +5672,16 @@ msgid "" "file will be ignored." msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:182 -msgid "copy" -msgstr "" - #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:184 +#: sources.list.5.xml:183 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " "This is useful for people using a zip disk to copy files around with APT." msgstr "" -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:189 -msgid "rsh" -msgstr "" - -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:189 -msgid "ssh" -msgstr "" - #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:191 +#: sources.list.5.xml:190 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -5784,68 +5691,59 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:199 -msgid "more recognizable URI types" +#: sources.list.5.xml:198 +msgid "adding more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:201 +#: sources.list.5.xml:200 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. maintains also the <literal>apt-transport-https</literal> package " +"<package>apt-transport-<replaceable>method</replaceable></package>. The APT " +"team e.g. maintains also the <package>apt-transport-https</package> 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> " -"<manvolnum>1</manvolnum></citerefentry>." +"see &apt-transport-debtorrent;." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:143 -msgid "" -"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " -"rsh. <placeholder type=\"variablelist\" id=\"0\"/>" -msgstr "" - -#. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:215 +#: sources.list.5.xml:212 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:217 +#: sources.list.5.xml:214 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:219 +#: sources.list.5.xml:216 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:220 +#: sources.list.5.xml:217 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:222 +#: sources.list.5.xml:219 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:223 +#: sources.list.5.xml:220 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:225 +#: sources.list.5.xml:222 msgid "" "The first line gets package information for the architectures in " "<literal>APT::Architectures</literal> while the second always retrieves " @@ -5853,7 +5751,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:227 +#: sources.list.5.xml:224 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" @@ -5861,33 +5759,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:230 +#: sources.list.5.xml:227 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:232 +#: sources.list.5.xml:229 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:234 +#: sources.list.5.xml:231 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:236 +#: sources.list.5.xml:233 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:238 +#: sources.list.5.xml:235 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -5896,19 +5794,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:242 +#: sources.list.5.xml:239 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:251 +#: sources.list.5.xml:248 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:244 +#: sources.list.5.xml:241 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under " @@ -5920,7 +5818,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:256 +#: sources.list.5.xml:253 msgid "&apt-cache; &apt-conf;" msgstr "" @@ -5963,7 +5861,7 @@ msgstr "" #. type: <p></p> #: guide.sgml:24 offline.sgml:25 msgid "" -"For more details, on Debian GNU/Linux systems, see the file " +"For more details, on Debian systems, see the file " "/usr/share/common-licenses/GPL for the full license." msgstr "" @@ -6189,12 +6087,12 @@ msgid "" "To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> " "and then choose the APT method. You will be prompted for a set of " "<em>Sources</em> which are places to fetch archives from. These can be " -"remote Internet sites, local Debian mirrors or CDROMs. Each source can " +"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " -"combine them to form a complete set of packages. If you have a CDROM then it " -"is a good idea to specify it first and then specify a mirror so that you " +"combine them to form a complete set of packages. If you have a CD-ROM then " +"it is a good idea to specify it first and then specify a mirror so that you " "have access to the latest bug fixes. APT will automatically use packages on " -"your CDROM before downloading from the Internet." +"your CD-ROM before downloading from the Internet." msgstr "" #. type: <example></example>