summaryrefslogtreecommitdiff
path: root/doc/po/apt-doc.pot
diff options
context:
space:
mode:
Diffstat (limited to 'doc/po/apt-doc.pot')
-rw-r--r--doc/po/apt-doc.pot263
1 files changed, 133 insertions, 130 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a723feb8e..6adb824b5 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-24 17:24+0300\n"
+"POT-Creation-Date: 2012-06-02 19:24+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -935,7 +935,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
@@ -1043,12 +1043,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: 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
+#: apt-cache.8.xml:343 apt-get.8.xml:518 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><title>
-#: 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
+#: 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:528 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 ""
@@ -1058,7 +1058,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: 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
+#: 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:534 apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
@@ -1071,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."
@@ -1087,7 +1087,7 @@ 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 ""
@@ -1095,16 +1095,16 @@ msgstr ""
#: 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><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 ""
@@ -1124,7 +1124,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 ""
@@ -1132,7 +1132,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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 ""
@@ -1193,7 +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."
+"manner that is easy to use for scripted applications."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1201,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>
@@ -1251,12 +1251,11 @@ msgstr ""
#: apt-config.8.xml:96
msgid ""
"Defines the output of each config option. &percnt;t will be replaced with "
-"the name of the option, &percnt;f with the complete optionname and &percnt;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 &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using "
-"&percnt;&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;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 &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -1278,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>
@@ -1309,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 ""
@@ -2084,6 +2085,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
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\" "
+"conflict resolution system, and it will attempt to upgrade the most "
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also "
+"&apt-preferences; 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 "
@@ -2093,33 +2109,20 @@ msgid ""
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\" "
-"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"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: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 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, "
+"<package>apt-utils</package> would be the argument provided, not "
+"<filename>apt-utils_&apt-product-version;_amd64.deb</filename>). 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>
@@ -2175,9 +2178,9 @@ msgstr ""
#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
"installed instead of removed."
msgstr ""
@@ -2205,15 +2208,14 @@ msgstr ""
#: apt-get.8.xml:172
msgid ""
"Source packages are tracked separately from binary packages via "
-"<literal>deb-src</literal> type lines in the &sources-list; file. This means "
-"that you will need to add such a line for each repository you want to get "
-"sources from. If you don't do this you will properly get another (newer, "
-"older or none) source version than the one you have installed or could "
-"install."
+"<literal>deb-src</literal> lines in the &sources-list; file. This means that "
+"you will need to add such a line for each repository you want to get sources "
+"from; otherwise you will probably get either the wrong (too old/too new) "
+"source versions or none at all."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2223,7 +2225,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2233,15 +2235,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package. By default "
@@ -2251,21 +2253,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2277,7 +2279,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2289,7 +2291,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for other packages and are "
@@ -2297,12 +2299,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink "
+"variable (e.g. <ulink "
"url=\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> "
"for Debian or <ulink "
"url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
@@ -2312,28 +2314,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -2349,9 +2351,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
"packages and handle the result. Use of this option together with "
"<option>-f</option> may produce an error in some situations. If a package is "
@@ -2361,7 +2363,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
msgid ""
"Disables downloading of packages. This is best used with "
"<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -2370,19 +2372,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file. Note that quiet level 2 implies <option>-y</option>, you should never "
+"file. Note that quiet level 2 implies <option>-y</option>; you should never "
"use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect. Configuration Item: "
+"may decide to do something you did not expect. Configuration Item: "
"<literal>quiet</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: "
@@ -2390,24 +2392,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:330
msgid ""
-"Simulation run as user will deactivate locking "
-"(<literal>Debug::NoLocking</literal>) automatic. Also a notice will be "
-"displayed indicating that this is only a simulation, if the option "
-"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: "
-"true). Neither NoLocking nor the notice will be triggered if run as root "
-"(root should know what he is doing without further warnings by "
-"<literal>apt-get</literal>)."
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option "
+"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is by "
+"default) a notice will also be displayed indicating that this is only a "
+"simulation. Runs performed as root do not trigger either NoLocking or the "
+"notice - superusers should know what they are doing without further warnings "
+"from <literal>apt-get</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>) or unpack "
+"(<literal>Inst</literal>). Square brackets indicate broken packages, and "
+"empty square brackets indicate breaks that are of no consequence (rare)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2430,7 +2433,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:359
msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
@@ -2462,7 +2465,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
"<literal>dist-upgrade</literal> to override a large number of undesired "
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@ -2471,7 +2474,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
msgid ""
-"Do not upgrade packages; When used in conjunction with "
+"Do not upgrade packages; when used in conjunction with "
"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
"packages on the command line from being upgraded if they are already "
"installed. Configuration Item: <literal>APT::Get::Upgrade</literal>."
@@ -2480,7 +2483,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:400
msgid ""
-"Do not install new packages; When used in conjunction with "
+"Do not install new packages; when used in conjunction with "
"<literal>install</literal>, <literal>only-upgrade</literal> will install "
"upgrades for already installed packages only and ignore requests to install "
"new packages. Configuration Item: "
@@ -2490,7 +2493,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:408
msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using "
"<literal>force-yes</literal> can potentially destroy your system! "
@@ -2501,7 +2504,7 @@ msgstr ""
#: apt-get.8.xml:416
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
"hash. Note that the file name to write to will not always match the file "
"name on the remote site! This also works with the <literal>source</literal> "
"and <literal>update</literal> commands. When used with the "
@@ -2523,25 +2526,25 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
msgid ""
-"Re-Install packages that are already installed and at the newest version. "
+"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:440
msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased. The only reason to turn it off is if you frequently "
-"change your source list. Configuration Item: "
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased. The only reason to turn it off is if you "
+"frequently change your sources list. Configuration Item: "
"<literal>APT::Get::List-Cleanup</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:450
msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
"overrides the general settings in "
"<filename>/etc/apt/preferences</filename>. Specifically pinned packages are "
@@ -2554,33 +2557,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:465
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where "
+"related to <option>--assume-yes</option>; where "
"<option>--assume-yes</option> will answer yes to any prompt, "
"<option>--trivial-only</option> will answer no. Configuration Item: "
"<literal>APT::Get::Trivial-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:472
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:478
msgid ""
"If the command is either <literal>install</literal> or "
-"<literal>remove</literal>, then this option acts like running "
-"<literal>autoremove</literal> command, removing the unused dependency "
+"<literal>remove</literal>, then this option acts like running the "
+"<literal>autoremove</literal> command, removing unused dependency "
"packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:485
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -2592,7 +2595,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:496
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -2601,14 +2604,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:502
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:508
+#: apt-get.8.xml:507
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: "
@@ -2616,7 +2619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:530
+#: apt-get.8.xml:529
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -2624,7 +2627,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:535
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -2807,7 +2810,7 @@ msgid ""
"prevent the package from being automatically installed, upgraded or "
"removed. The command is only a wrapper around <command>dpkg "
"--set-selections</command> and the state is therefore maintained by &dpkg; "
-"and not effected by the <option>--filename</option> option."
+"and not effected by the <option>--file</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3712,8 +3715,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: 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 "
@@ -4255,7 +4258,7 @@ msgstr ""
#: 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>
@@ -5643,7 +5646,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: 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 ""
@@ -6086,12 +6089,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>