summaryrefslogtreecommitdiff
path: root/doc/po
diff options
context:
space:
mode:
Diffstat (limited to 'doc/po')
-rw-r--r--doc/po/apt-doc.pot355
-rw-r--r--doc/po/de.po817
-rw-r--r--doc/po/es.po467
-rw-r--r--doc/po/fr.po473
-rw-r--r--doc/po/it.po365
-rw-r--r--doc/po/ja.po478
-rw-r--r--doc/po/pl.po471
-rw-r--r--doc/po/pt.po467
-rw-r--r--doc/po/pt_BR.po372
9 files changed, 1509 insertions, 2756 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 364dce12f..edab6f379 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+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"
@@ -566,7 +566,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
+#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
msgid "Description"
msgstr ""
@@ -944,7 +944,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr ""
@@ -1187,12 +1187,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr ""
@@ -1202,7 +1202,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234
+#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 sources.list.5.xml:234
msgid "See Also"
msgstr ""
@@ -1212,7 +1212,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr ""
@@ -1311,7 +1311,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr ""
@@ -2573,7 +2573,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 sources.list.5.xml:198
msgid "Examples"
msgstr ""
@@ -3616,34 +3616,20 @@ msgid ""
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-msgid "net-update"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch "
-"from. APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3654,42 +3640,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -3697,8 +3683,8 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -3717,21 +3703,21 @@ msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> "
"<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
"choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
+"choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> "
"</group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>"
+"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> <arg "
+"choice=\"plain\">showauto</arg> </group>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3741,128 +3727,104 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
+#: apt-mark.8.xml:84
+msgid "showauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:85
msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:96
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
-msgid "showauto"
+#: apt-mark.8.xml:97
+msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:100
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
+"Read/Write package stats from "
+"<filename><replaceable>FILENAME</replaceable></filename> instead of 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><varlistentry><term>
-#: apt-mark.8.xml:109
-msgid "showmanual"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-msgid "showhold"
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
-msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
-msgid ""
-"Read/Write package stats from "
-"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
-"default location, which is <filename>extended_status</filename> in the "
-"directory defined by the Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:116
+msgid "Show the program version."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -6188,133 +6150,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a "
-"glob()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, no-wrap
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, no-wrap
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6322,7 +6233,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6331,14 +6242,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6355,12 +6266,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6370,7 +6281,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6378,7 +6289,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -6387,12 +6298,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6400,27 +6311,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
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>: "
@@ -6432,12 +6343,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6448,18 +6359,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6470,13 +6381,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -6487,7 +6398,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6496,12 +6407,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6513,18 +6424,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6533,18 +6444,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6553,13 +6464,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6573,7 +6484,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6588,12 +6499,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6601,12 +6512,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6621,7 +6532,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6631,7 +6542,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6640,7 +6551,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6649,13 +6560,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6664,12 +6575,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -6686,7 +6597,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6697,7 +6608,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6706,13 +6617,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6724,12 +6635,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6751,7 +6662,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6766,7 +6677,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6775,13 +6686,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6793,12 +6704,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 6261a470e..dd3cdf8f4 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,14 @@
# Translation of apt-doc to German
# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
# This file is distributed under the same license as the apt-doc package.
-# Chris Leick <c.leick@vollbio.de>, 2009-2011.
+# Chris Leick <c.leick@vollbio.de>, 2009, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.8.14-1\n"
+"Project-Id-Version: apt-doc 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
-"PO-Revision-Date: 2011-05-31 21:00+0100\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"PO-Revision-Date: 2010-09-16 19:04+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
@@ -656,12 +656,16 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+#| "<date>14 February 2004</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
"February 2011</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-"<date>04. Februar 2011</date>"
+"<date>14. Februar 2004</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-cache.8.xml:25 apt-cache.8.xml:32
@@ -686,10 +690,33 @@ msgstr "APT"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cache.8.xml:33
msgid "query the APT cache"
-msgstr "den APT-Zwischenspeicher abfragen"
+msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-cache.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
+#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
+#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
+#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
+#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
+#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#| "group>"
msgid ""
"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -714,15 +741,16 @@ msgstr ""
"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
"o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> "
"<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</"
-"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
-"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
+"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>Datei</replaceable></arg></arg> <arg>gencaches</arg> "
+"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
+"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
+"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain"
+"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends "
+"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+"arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
"replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
"\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice="
"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
@@ -735,7 +763,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -1254,7 +1282,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr "Optionen"
@@ -1548,13 +1576,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr "Dateien"
@@ -1566,8 +1594,8 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
msgid "See Also"
msgstr "Siehe auch"
@@ -1580,7 +1608,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnose"
@@ -1709,7 +1737,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr "Optionen"
@@ -2281,18 +2309,6 @@ msgid ""
"literal>. It then writes to stdout a Release file containing a MD5, SHA1 "
"and SHA256 digest for each file."
msgstr ""
-"Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
-"Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene "
-"Verzeichnis nach nicht komprimierten <filename>Packages</filename>- und "
-"<filename>Sources</filename>-Dateien und denen, die mit <command>gzip</"
-"command>, <command>bzip2</command> oder <command>lzma</command> komprimiert "
-"wurden, ebenso wie <filename>Release</filename>- und <filename>md5sum.txt</"
-"filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</"
-"literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, "
-"indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> "
-"aufgeführt werden. Dann schreibt er eine Release-Datei auf die "
-"Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme "
-"enthält."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:125
@@ -3131,11 +3147,19 @@ msgstr ""
msgid ""
"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
msgstr ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-# FIXME <literal>Checksum</literal> im letzten Abschnitt <replaceable>?
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:531
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
msgid ""
"Generate the given checksum. These options default to on, when turned off "
"the generated index files will not have the checksum fields where possible. "
@@ -3147,16 +3171,14 @@ msgid ""
"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
"literal> or <literal>SHA256</literal>."
msgstr ""
-"erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
-"aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "
-"Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: "
-"<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und "
-"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
-"<replaceable>Prüfsumme</replaceable></literal>, wobei <literal>Index</"
-"literal> <literal>Packages</literal>, <literal>Sources</literal> oder "
-"<literal>Release</literal> sein kann und <literal>Checksum</literal> "
-"<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
-"literal> sein kann."
+"Werte für zusätzliche Metadatenfelder in der Release-Datei werden den "
+"entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> "
+"entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die "
+"unterstützten Felder sind: <literal>Origin</literal>, <literal>Label</"
+"literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+"<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until</"
+"literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:539
@@ -3327,7 +3349,7 @@ msgstr ""
"werden kann."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Beispiele"
@@ -3819,17 +3841,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:281
msgid "download"
-msgstr "download"
+msgstr ""
-# FIXME s/directoy/directory/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:282
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directoy."
msgstr ""
-"<literal>download</literal> wird das angegebene Binärpaket in das aktuelle "
-"Verzeichnis herunterladen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:288
@@ -3894,7 +3913,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:312
msgid "changelog"
-msgstr "changelog"
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:313
@@ -3908,14 +3927,6 @@ msgid ""
"installed. However, you can specify the same options as for the "
"<option>install</option> command."
msgstr ""
-"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
-"zeigt es mit <command>sensible-pager</command> an. Der Servername und das "
-"Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</"
-"literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</"
-"ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</"
-"ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die "
-"installierte Version. Sie können jedoch die gleichen Optionen wie für den "
-"Befehl <option>install</option> angeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:335
@@ -3933,17 +3944,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:340
+#, fuzzy
+#| msgid "<option>--no-suggests</option>"
msgid "<option>--install-suggests</option>"
-msgstr "<option>--install-suggests</option>"
+msgstr "<option>--no-suggests</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:341
+#, fuzzy
+#| msgid ""
+#| "Do not consider recommended packages as a dependency for installing. "
+#| "Configuration Item: <literal>APT::Install-Recommends</literal>."
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
-"Empfohlene Pakete als Abhängigkeit für die Installation betrachten. "
-"Konfigurationselement: <literal>APT::Install-Suggests</literal>."
+"Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. "
+"Konfigurationselement: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:345
@@ -4719,24 +4736,8 @@ msgstr ""
"aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die "
"nicht länger gültig sind."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4745,12 +4746,12 @@ msgstr ""
"Befehlen definiert sein müssen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>Dateiname</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4767,58 +4768,54 @@ msgstr ""
"Schlüssel werden zu diesem hinzugefügt."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. "
"August 2009</date>"
@@ -4837,22 +4834,13 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>DATEINAME</replaceable></option></arg> <group choice=\"plain"
@@ -4862,7 +4850,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4871,7 +4859,7 @@ msgstr ""
"installiert markiert ist."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4887,21 +4875,14 @@ msgstr ""
"<command>aptitude</command> entfernt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
-#, fuzzy
-#| msgid ""
-#| "<literal>markauto</literal> is used to mark a package as being "
-#| "automatically installed, which will cause the package to be removed when "
-#| "no more manually installed packages depend on this package."
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4910,19 +4891,14 @@ msgstr ""
"keine manuell installierten Pakete von ihm abhängen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
+msgstr "unmarkauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
-#| "installed, which will prevent the package from being automatically "
-#| "removed if no other packages depend on it."
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4931,102 +4907,28 @@ msgstr ""
"entfernt wird, wenn kein anderes Paket von ihm abhängt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
-msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
-"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:84
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
+#: apt-mark.8.xml:85
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
+"installed packages with each package on a new line."
msgstr ""
"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
-"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:96
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
"<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:97
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5035,7 +4937,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:100
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5047,18 +4949,48 @@ msgstr ""
"filename> im von Konfigurationselement <literal>Dir::State</literal> "
"definierten Verzeichnis, ist."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
+msgstr "<option>-h</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
+msgstr "Eine kurze Zusammenfassung anzeigen."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
+msgstr "<option>-v</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:116
+msgid "Show the program version."
+msgstr "Die Programmversion anzeigen."
+
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5273,6 +5205,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:147
+#, fuzzy
+#| msgid ""
+#| "In order to add a new key you need to first download it (you should make "
+#| "sure you are using a trusted communication channel when retrieving it), "
+#| "add it with <command>apt-key</command> and then run <command>apt-get "
+#| "update</command> so that apt can download and verify the "
+#| "<filename>Release.gpg</filename> files from the archives you have "
+#| "configured."
msgid ""
"In order to add a new key you need to first download it (you should make "
"sure you are using a trusted communication channel when retrieving it), add "
@@ -5285,9 +5225,8 @@ msgstr ""
"(Sie sollten sicherstellen, dass Sie einen vertrauenswürdigen "
"Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit "
"<command>apt-key</command> hinzufügen und dann <command>apt-get update</"
-"command> ausführen, so dass APT die Dateien <filename>InRelease</filename> "
-"oder <filename>Release.gpg</filename> der von Ihnen konfigurierten Archive "
-"herunterladen und prüfen kann."
+"command> ausführen, so dass APT die <filename>Release.gpg</filename>-Dateien "
+"der von Ihnen konfigurierten Archive herunterladen und prüfen kann."
#. type: Content of: <refentry><refsect1><title>
#: apt-secure.8.xml:156
@@ -5316,14 +5255,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
+#| "abs -o Release.gpg Release</command>."
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
"gpg Release</command>."
msgstr ""
"<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie "
-"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -"
-"abs -o Release.gpg Release</command> ausführen."
+"<command>gpg -abs -o Release.gpg Release</command> ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:172
@@ -5514,9 +5456,14 @@ msgstr ""
"die Datei, die durch die Umgebungsvariable <envar>APT_CONFIG</envar> "
"angegeben wird (falls gesetzt)"
-# FIXME s/no or/no/
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+#| "order which have no or \"<literal>conf</literal>\" as filename extension "
+#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
+#| "period (.) characters - otherwise they will be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
"order which have no or \"<literal>conf</literal>\" as filename extension and "
@@ -5527,12 +5474,9 @@ msgid ""
msgstr ""
"alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
"alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als "
-"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, "
-"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls "
-"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die "
-"Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-"
-"Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend "
-"ignoriert."
+"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche "
+"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie "
+"stillschweigend ignoriert."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:59
@@ -6561,9 +6505,20 @@ msgstr ""
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
-# FIXME s/> Note/>. Note/
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:442
+#, fuzzy
+#| msgid ""
+#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+#| "replaceable></literal> will be checked: If this setting exists the method "
+#| "will only be used if this file exists, e.g. for the bzip2 method (the "
+#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
+#| "also that list entries specified on the command line will be added at the "
+#| "end of the list specified in the configuration files, but before the "
+#| "default entries. To prefer a type in this case over the ones specified in "
+#| "in the configuration files you can set the option direct - not in list "
+#| "style. This will not override the defined list, it will only prefix the "
+#| "list with this type."
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6580,15 +6535,14 @@ msgstr ""
"replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung "
"existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für "
"die (integrierte) bzip2-Methode ist die Einstellung <placeholder type="
-"\"literallayout\" id=\"0\"/>. Beachten Sie auch, dass auf der Befehlszeile "
+"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile "
"eingegebenen Einträge an das Ende der Liste angehängt werden, die in den "
"Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um "
-"einen Typ in diesem Fall gegenüber einem, der über die Konfigurationsdatei "
-"angegebenen wurde, zu bevorzugen, können Sie diese Option direkt setzen – "
-"nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es "
-"wird diesen Typ nur vor die Liste setzen."
+"einen Eintrag in diesem Fall vor einem, über die in der Konfigurationsdatei "
+"angegebenen, zu bevorzugen, können Sie diese Option direkt setzen – nicht im "
+"Listenstil. Dies wird die definierte Liste nicht überschreiben, es wird "
+"diesen Typ nur vor die Liste setzen."
-# FIXME: s/doesn't provide/don't provide/
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:449
msgid ""
@@ -6596,10 +6550,6 @@ msgid ""
"uncompressed files a preference, but note that most archives doesn't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
-"Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um "
-"unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass "
-"die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass "
-"dies meist nur für lokale Spiegel benutzt werden kann."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:454
@@ -7035,6 +6985,19 @@ msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt.conf.5.xml:621
+#, fuzzy
+#| msgid ""
+#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
+#| "multiply calls of dpkg. Without further options dpkg will use triggers "
+#| "only in between his own run. Activating these options can therefore "
+#| "decrease the time needed to perform the install / upgrade. Note that it "
+#| "is intended to activate these options per default in the future, but as "
+#| "it changes the way APT calling dpkg drastically it needs a lot more "
+#| "testing. <emphasis>These options are therefore currently experimental "
+#| "and should not be used in productive environments.</emphasis> Also it "
+#| "breaks the progress reporting so all frontends will currently stay around "
+#| "half (or more) of the time in the 100% state while it actually configures "
+#| "all packages."
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 "
@@ -7047,18 +7010,17 @@ msgid ""
"all frontends will currently stay around half (or more) of the time in the "
"100% state while it actually configures all packages."
msgstr ""
-"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern "
-"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird "
-"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen "
-"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit "
-"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft "
-"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, "
-"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese "
-"Optionen sind daher aktuell noch experimentell und sollten nicht in "
-"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es "
-"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder "
-"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete "
-"konfiguriert werden."
+"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von Triggern "
+"über mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird Dpkg "
+"Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen zu "
+"benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit verkürzen. "
+"Beachten Sie, dass geplant ist, diese Optionen in Zukunft standardmäßig zu "
+"aktivieren, aber da es die Art, wie APT Dpkg aufruft, drastisch ändert, "
+"benötigt es noch viele weitere Tests. <emphasis>Diese Optionen sind daher "
+"aktuell noch experimentell und sollten nicht in produktiven Umgebungen "
+"benutzt werden.</emphasis> Außerdem unterbricht es die Fortschrittsanzeige, "
+"so dass alle Oberflächen aktuell in der halben (oder mehr) Zeit auf dem "
+"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
#: apt.conf.5.xml:636
@@ -7878,6 +7840,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:70
+#, fuzzy
+#| msgid ""
+#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+#| "directory are parsed in alphanumeric ascending order and need to obey the "
+#| "following naming convention: The files have no or \"<literal>pref</"
+#| "literal>\" as filename extension and which only contain alphanumeric, "
+#| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
+#| "will be silently ignored."
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
@@ -7888,14 +7858,11 @@ msgid ""
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
-"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences."
-"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden "
-"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder "
-"<literal>»pref«</literal> als Dateierweiterung und sie enthalten nur "
-"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). "
-"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert "
-"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste "
-"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird "
+"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in "
+"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden "
+"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als "
+"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche "
+"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden "
"sie stillschweigend ignoriert."
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7953,19 +7920,17 @@ msgstr "Priorität 1"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
-#| "<literal>experimental</literal> archive."
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
"<literal>experimental</literal> archive."
msgstr ""
-"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</"
-"filename>-Dateien als »NotAutomatic: yes« markiert sind, aber "
-"<emphasis>nicht</emphasis> als »ButAutomaticUpgrades: yes« wie das Archiv "
-"<literal>experimental</literal> von Debian."
+"zu den Versionen, die von Archiven kommen, deren <filename>Release</"
+"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
+"Experimental-Archiv."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:113
@@ -7974,17 +7939,20 @@ msgstr "Priorität 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:114
+#, fuzzy
+#| msgid ""
+#| "to the versions coming from archives which in their <filename>Release</"
+#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
+#| "experimental archive."
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
-"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu "
-"Versionen, die von Archiven kommen, die in deren <filename>Release</"
-"filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« "
-"markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-"
-"backports</literal>."
+"zu den Versionen, die von Archiven kommen, deren <filename>Release</"
+"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
+"Experimental-Archiv."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:121
@@ -8029,10 +7997,9 @@ msgstr ""
#| msgid ""
#| "If the target release has not been specified then APT simply assigns "
#| "priority 100 to all installed package versions and priority 500 to all "
-#| "uninstalled package versions, except versions coming from archives which "
+#| "uninstalled package versions, expect versions coming from archives which "
#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
-#| "yes\" - these versions get the priority 1 or priority 100 if it is "
-#| "additionally marked as \"ButAutomaticUpgrades: yes\"."
+#| "yes\" - these versions get the priority 1."
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8044,10 +8011,8 @@ msgstr ""
"Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen "
"installierten Paketversionen eine Priorität von 100 und allen nicht "
"installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen "
-"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien "
-"»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 "
-"oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« "
-"markiert sind."
+"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert "
+"ist – diese Versionen erhalten die Prirität 1."
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:139
@@ -8347,85 +8312,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr "Reguläre Ausdrücke und glob()-Syntax"
-
-# FIXME: s/expression or/expression) or/
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
-"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
-"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei "
-"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder "
-"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der "
-"von Schrägstrichen umschlossen wird)."
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, no-wrap
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-
-# FIXME: s/Those/Thus/
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
-"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen "
-"Paketen von einem Release seit Karmic die Priorität 900 zu."
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, no-wrap
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr "Package"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr "*"
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8434,12 +8331,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8448,12 +8345,12 @@ msgstr ""
"Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8463,12 +8360,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8478,12 +8375,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8492,17 +8389,17 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8513,7 +8410,7 @@ msgstr ""
"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8527,7 +8424,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8536,7 +8433,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8564,12 +8461,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8584,7 +8481,7 @@ msgstr ""
"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8595,7 +8492,7 @@ msgstr ""
"sogar wenn diese Versionen zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8609,12 +8506,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8625,27 +8522,27 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr "die <literal>Package:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr "die <literal>Version:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8666,12 +8563,12 @@ msgstr ""
"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8688,18 +8585,18 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr "die <literal>Codename:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8716,13 +8613,13 @@ msgstr ""
"anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -8738,7 +8635,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8750,12 +8647,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr "die <literal>Component:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8773,18 +8670,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr "die <literal>Origin:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8796,18 +8693,18 @@ msgstr ""
"in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr "die <literal>Label:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8820,13 +8717,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8849,7 +8746,7 @@ msgstr ""
"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8875,12 +8772,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8891,12 +8788,12 @@ msgstr ""
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8920,7 +8817,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8935,8 +8832,8 @@ msgstr ""
"Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8948,7 +8845,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8961,13 +8858,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8981,12 +8878,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -9014,7 +8911,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9031,7 +8928,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9044,13 +8941,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9070,12 +8967,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr "Die Entwicklung eines Codename-Releases verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9110,7 +9007,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9136,7 +9033,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9149,13 +9046,13 @@ msgstr ""
"literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9175,12 +9072,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9238,6 +9135,14 @@ msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:54
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise they will be silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
"add sources.list entries in separate files. The format is the same as for "
@@ -9253,10 +9158,8 @@ msgstr ""
"Das Format ist das gleiche wie für die normale <filename>sources.list</"
"filename>-Datei. Dateinamen müssen mit <filename>.list</filename> enden und "
"können nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), "
-"Bindestriche (-) und Punkte (.) enthalten. Andernfalls wird APT einen "
-"Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht "
-"auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-"
-"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
+"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie "
+"stillschweigend ignoriert."
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml:65
@@ -9265,6 +9168,17 @@ msgstr "Die Typen deb und deb-src"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:66
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type describes a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. Typically, "
+#| "<literal>distribution</literal> is generally one of <literal>stable</"
+#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
+#| "component is one of <literal>main</literal> <literal>contrib</literal> "
+#| "<literal>non-free</literal> or <literal>non-us</literal>. The "
+#| "<literal>deb-src</literal> type describes a debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -9279,14 +9193,14 @@ msgid ""
msgstr ""
"Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
"Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</"
-"literal> ist typischerweise ein Archivname wie <literal>stable</literal> "
-"oder <literal>testing</literal> oder ein Kodename wie <literal>&stable-"
-"codename;</literal> oder <literal>&testing-codename;</literal> während "
-"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder "
-"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ "
-"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie "
-"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird "
-"benötigt, um Quellindizes herunterzuladen."
+"literal> ist typischerweise entweder <literal>stable</literal>, "
+"<literal>unstable</literal> oder <literal>testing</literal>, während "
+"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, "
+"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der "
+"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-"
+"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine "
+"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes "
+"herunterzuladen."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
@@ -9639,12 +9553,22 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
#: sources.list.5.xml:230
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:223
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
+#| "US directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
+#| "filename> on m68k, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; non-"
+#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
+#| "id=\"0\"/>"
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9654,14 +9578,14 @@ msgid ""
"archives are not structured like this] <placeholder type=\"literallayout\" "
"id=\"0\"/>"
msgstr ""
-"Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
+"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-"
"Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "
"<filename>unstable/binary-i386</filename> auf i386-Maschinen, "
-"<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für "
-"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass "
-"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt "
-"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder "
-"type=\"literallayout\" id=\"0\"/>"
+"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere "
+"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses "
+"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. "
+"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout"
+"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:235
@@ -11234,27 +11158,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
#~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</"
#~ "literal>"
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
-#~ msgid "Show a short usage summary."
-#~ msgstr "Eine kurze Zusammenfassung anzeigen."
-
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
-#~ msgid "Show the program version."
-#~ msgstr "Die Programmversion anzeigen."
-
#~ msgid "to the version that is already installed (if any)."
#~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
diff --git a/doc/po/es.po b/doc/po/es.po
index 3a21eeecb..6b9b667e2 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
"PO-Revision-Date: 2010-08-25 03:25+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -810,7 +810,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -1327,7 +1327,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr "Opciones"
@@ -1618,13 +1618,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr "Ficheros"
@@ -1636,8 +1636,8 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
msgid "See Also"
msgstr "Véase también"
@@ -1650,7 +1650,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -1779,7 +1779,7 @@ msgstr ""
"option>. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr "Opciones"
@@ -3396,7 +3396,7 @@ msgstr ""
"con la orden «generate»."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Ejemplos"
@@ -4771,24 +4771,8 @@ msgstr ""
"Actualiza el registro de claves local con el registro de claves del archivo "
"Debian, y elimina del registro las claves del archivo que ya no son válidas."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4797,12 +4781,12 @@ msgstr ""
"descritas en el sección anterior."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4819,57 +4803,53 @@ msgstr ""
"esto es, por ejemplo, que las claves nuevas se añaden a este fichero."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr "Base de datos local de las claves de confianza de archivos Debian"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr "Registro de las claves de confianza del archivo de Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 de "
"Agosto de 2009</date>"
@@ -4886,22 +4866,13 @@ msgstr "Marca o desmarca un paquete como instalado automáticamente"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice="
@@ -4911,7 +4882,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4920,7 +4891,7 @@ msgstr ""
"o no."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4936,21 +4907,14 @@ msgstr ""
"eliminará."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
-#, fuzzy
-#| msgid ""
-#| "<literal>markauto</literal> is used to mark a package as being "
-#| "automatically installed, which will cause the package to be removed when "
-#| "no more manually installed packages depend on this package."
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4959,19 +4923,14 @@ msgstr ""
"paquete instalado manualmente dependa de este paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
+msgstr "unmarkauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
-#| "installed, which will prevent the package from being automatically "
-#| "removed if no other packages depend on it."
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4980,95 +4939,21 @@ msgstr ""
"ningún otro depende de él."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
-msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
-"instalados automáticamente, un paquete por línea."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:84
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
+#: apt-mark.8.xml:85
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
-msgstr ""
-"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
-"instalados automáticamente, un paquete por línea."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
+"installed packages with each package on a new line."
msgstr ""
"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
"instalados automáticamente, un paquete por línea."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:96
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
@@ -5076,7 +4961,7 @@ msgstr ""
"filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:97
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5085,7 +4970,7 @@ msgstr ""
"filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:100
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5098,18 +4983,48 @@ msgstr ""
"en el directorio definido en la opción de configuración: <literal>Dir::"
"State</literal>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
+msgstr "<option>-h</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
+msgstr "Muestra un breve resumen de uso."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
+msgstr "<option>-v</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:116
+msgid "Show the program version."
+msgstr "Muestra la versión del programa."
+
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -8391,84 +8306,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8477,12 +8325,12 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8491,12 +8339,12 @@ msgstr ""
"que la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8506,12 +8354,12 @@ msgstr ""
"más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8520,12 +8368,12 @@ msgstr ""
"perteneciente a otra distribución, o si la versión instalada es más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8533,17 +8381,17 @@ msgstr ""
"La versión sólo se instala si no hay ninguna versión del paquete instalada."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr "Evita la instalación de la versión."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8554,7 +8402,7 @@ msgstr ""
"siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8568,7 +8416,7 @@ msgstr ""
"versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8577,7 +8425,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8605,12 +8453,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr "Por ello:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8625,7 +8473,7 @@ msgstr ""
"la versión 5.8*, desactualizando el paquete."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8636,7 +8484,7 @@ msgstr ""
"versiones, incluso sobre los pertenecientes a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8649,12 +8497,12 @@ msgstr ""
"hay ninguna versión del paquete ya instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinar la versión del paquete y las propiedades de la distribución"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8665,27 +8513,27 @@ msgstr ""
"describen los paquetes disponibles en cada uno de los sitios."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr "La línea <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr "indica el nombre del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr "La línea <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr "indica el número de versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8706,12 +8554,12 @@ msgstr ""
"de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8729,18 +8577,18 @@ msgstr ""
"línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr "La línea <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8759,13 +8607,13 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -8781,7 +8629,7 @@ msgstr ""
"siguientes línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8793,12 +8641,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr "La línea <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8817,18 +8665,18 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr "La línea <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8841,18 +8689,18 @@ msgstr ""
"mediante la siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr "La línea <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8865,13 +8713,13 @@ msgstr ""
"siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8894,7 +8742,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8919,12 +8767,12 @@ msgstr ""
"la distribución «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr "Líneas opcionales en el registro de preferencias de APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8935,12 +8783,12 @@ msgstr ""
"Útil para comentarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr "Seguir la distribución «stable» (estable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8964,7 +8812,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8979,8 +8827,8 @@ msgstr ""
"<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8992,7 +8840,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9006,13 +8854,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -9025,12 +8873,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -9058,7 +8906,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9075,7 +8923,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9088,13 +8936,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9113,12 +8961,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr "Seguir la evolución de una publicación por el nombre"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9152,7 +9000,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9179,7 +9027,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9193,13 +9041,13 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9218,12 +9066,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -11260,27 +11108,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
#~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::"
#~ "FTPArchive::MD5</literal>"
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
-#~ msgid "Show a short usage summary."
-#~ msgstr "Muestra un breve resumen de uso."
-
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
-#~ msgid "Show the program version."
-#~ msgstr "Muestra la versión del programa."
-
#~ msgid "to the version that is already installed (if any)."
#~ msgstr "a la versión instalada (de existir)."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index e4a5e1694..c3648fc88 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
"PO-Revision-Date: 2011-02-17 07:50+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -731,7 +731,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -1250,7 +1250,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr "options"
@@ -1546,13 +1546,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr "Fichiers"
@@ -1564,8 +1564,8 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
msgid "See Also"
msgstr "Voir aussi"
@@ -1578,7 +1578,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -1707,7 +1707,7 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr "Options"
@@ -3325,7 +3325,7 @@ msgstr ""
"generate."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Exemples"
@@ -4709,24 +4709,8 @@ msgstr ""
"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
"l'archive Debian et supprimer les clés qui y sont périmées."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4735,12 +4719,12 @@ msgstr ""
"décrites dans la section suivante."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>fichier</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4757,57 +4741,53 @@ msgstr ""
"les nouvelles clés y seront ajoutées."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr "Base de données locale de fiabilité des clés de l'archive."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"août 2009</date>"
@@ -4824,22 +4804,13 @@ msgstr "Indiquer si un paquet a été installé automatiquement ou non"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> "
@@ -4849,7 +4820,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4858,7 +4829,7 @@ msgstr ""
"a été automatiquement installé ou pas."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4874,21 +4845,14 @@ msgstr ""
"command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
-#, fuzzy
-#| msgid ""
-#| "<literal>markauto</literal> is used to mark a package as being "
-#| "automatically installed, which will cause the package to be removed when "
-#| "no more manually installed packages depend on this package."
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4897,19 +4861,14 @@ msgstr ""
"que plus aucun paquet installé manuellement ne dépend de lui."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
+msgstr "unmarkauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
-#| "installed, which will prevent the package from being automatically "
-#| "removed if no other packages depend on it."
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4918,102 +4877,28 @@ msgstr ""
"aucun autre paquet n'en dépend."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
-msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
-"un paquet par ligne."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:84
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
+#: apt-mark.8.xml:85
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
+"installed packages with each package on a new line."
msgstr ""
"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
"un paquet par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
-"un paquet par ligne."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:96
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:97
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5022,7 +4907,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:100
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5034,18 +4919,48 @@ msgstr ""
"par défaut (<filename>extended_status</filename> dans le répertoire défini "
"par l'élément de configuration <literal>Dir::State</literal>)."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
+msgstr "<option>-h</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
+msgstr "Affiche un résumé de l'aide"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
+msgstr "<option>-v</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:116
+msgid "Show the program version."
+msgstr "Affiche la version du programme."
+
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -8315,84 +8230,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8401,12 +8249,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8416,12 +8264,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8430,12 +8278,12 @@ msgstr ""
"distribution par défaut ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8444,29 +8292,29 @@ msgstr ""
"autre distribution ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr "la version sera installée si aucune version du paquet n'est installée."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8477,7 +8325,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8491,7 +8339,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8500,7 +8348,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8528,12 +8376,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8547,7 +8395,7 @@ msgstr ""
"installée est une version 5.9*, il y aura un retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8558,7 +8406,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8571,13 +8419,13 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
"Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8588,27 +8436,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr "la ligne <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr "donne le nom du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr "la ligne <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8629,12 +8477,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8651,18 +8499,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr "la ligne <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8680,13 +8528,13 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -8702,7 +8550,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8714,12 +8562,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr "La ligne <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8737,18 +8585,18 @@ msgstr ""
"fichier des préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr "La ligne <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8761,18 +8609,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr "La ligne <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8785,13 +8633,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8815,7 +8663,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8840,12 +8688,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr "Lignes facultatives dans le fichier des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8856,12 +8704,12 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8885,7 +8733,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8900,8 +8748,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8913,7 +8761,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8926,13 +8774,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8945,12 +8793,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr "Méthode pour suivre Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -8978,7 +8826,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8995,7 +8843,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9008,13 +8856,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9033,12 +8881,12 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr "Suivre l'évolution d'une version par son nom de code"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9072,7 +8920,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9096,7 +8944,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9109,13 +8957,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9134,12 +8982,12 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -11185,6 +11033,9 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "est affectée à la version déjà installée (si elle existe)."
+
#~ msgid "<option>--md5</option>"
#~ msgstr "<option>--md5</option>"
@@ -11198,30 +11049,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::"
#~ "FTPArchive::MD5</literal>."
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
-#~ msgid "Show a short usage summary."
-#~ msgstr "Affiche un résumé de l'aide"
-
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
-#~ msgid "Show the program version."
-#~ msgstr "Affiche la version du programme."
-
-#~ msgid "to the version that is already installed (if any)."
-#~ msgstr "est affectée à la version déjà installée (si elle existe)."
-
#~ msgid "APT package handling utility -- cache manipulator"
#~ msgstr "Gestionnaire de paquets APT - manipulation du cache"
diff --git a/doc/po/it.po b/doc/po/it.po
index 4571690e1..dec77747d 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -532,7 +532,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -910,7 +910,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr ""
@@ -1156,13 +1156,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr ""
@@ -1174,8 +1174,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
msgid "See Also"
msgstr ""
@@ -1188,7 +1188,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr ""
@@ -1287,7 +1287,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr ""
@@ -2549,7 +2549,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
msgid "Examples"
msgstr ""
@@ -3586,35 +3586,20 @@ msgid ""
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-#, fuzzy
-msgid "net-update"
-msgstr "upgrade"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3625,43 +3610,43 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -3669,8 +3654,8 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -3689,21 +3674,20 @@ msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3713,131 +3697,107 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
+#: apt-mark.8.xml:84
+msgid "showauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:85
msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:96
msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
-msgid "showauto"
+#: apt-mark.8.xml:97
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:100
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of 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><varlistentry><term>
-#: apt-mark.8.xml:109
-msgid "showmanual"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-msgid "showhold"
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:116
+msgid "Show the program version."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -6149,133 +6109,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, no-wrap
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, no-wrap
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6283,7 +6192,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6292,14 +6201,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6316,12 +6225,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6331,7 +6240,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6339,7 +6248,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6348,12 +6257,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6361,27 +6270,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6394,12 +6303,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6410,18 +6319,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6432,13 +6341,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -6448,7 +6357,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6457,12 +6366,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6473,18 +6382,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6493,18 +6402,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6513,13 +6422,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6533,7 +6442,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6548,12 +6457,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6561,12 +6470,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6581,7 +6490,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6591,8 +6500,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6601,7 +6510,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6610,13 +6519,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6625,12 +6534,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -6647,7 +6556,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6658,7 +6567,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6667,13 +6576,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6685,12 +6594,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6710,7 +6619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6725,7 +6634,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6734,13 +6643,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6752,12 +6661,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 607d7e64d..d0d2ef275 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
"PO-Revision-Date: 2010-09-07 07:38+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -792,7 +792,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -1329,7 +1329,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr "オプション"
@@ -1628,14 +1628,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr "ファイル"
@@ -1648,8 +1648,8 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
msgid "See Also"
msgstr "関連項目"
@@ -1664,7 +1664,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -1800,7 +1800,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr "オプション"
@@ -3482,7 +3482,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
msgid "Examples"
msgstr "サンプル"
@@ -4884,24 +4884,8 @@ msgstr ""
"Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー"
"リングから削除します。"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4911,12 +4895,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>filename</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4932,35 +4916,35 @@ msgstr ""
"加されます。"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr "アーカイブキーのローカル信頼データベースです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
@@ -4968,26 +4952,22 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
@@ -5007,22 +4987,13 @@ msgstr "パッケージが自動的にインストールされたかどうかの
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5033,7 +5004,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -5043,7 +5014,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5058,22 +5029,15 @@ msgstr ""
"command> や <command>aptitude</command> により削除されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr "markauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
-#, fuzzy
-#| msgid ""
-#| "<literal>markauto</literal> is used to mark a package as being "
-#| "automatically installed, which will cause the package to be removed when "
-#| "no more manually installed packages depend on this package."
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -5082,20 +5046,15 @@ msgstr ""
"なくなると、このパッケージを削除します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
+msgstr "unmarkauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
-#| "installed, which will prevent the package from being automatically "
-#| "removed if no other packages depend on it."
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -5104,105 +5063,29 @@ msgstr ""
"ケージを自動的に削除するのを防ぎます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
-msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
-"ケージごとに改行して表示します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:84
msgid "showauto"
msgstr "showauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
+#: apt-mark.8.xml:85
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
+"installed packages with each package on a new line."
msgstr ""
"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
"ケージごとに改行して表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
-"ケージごとに改行して表示します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:96
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:97
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5212,7 +5095,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:100
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5223,20 +5106,52 @@ msgstr ""
"トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
"filename> からパッケージの統計を読み書きします。"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
+msgstr "<option>-h</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
+msgstr "<option>--help</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
+msgstr "短い使用方法を表示します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
+msgstr "<option>-v</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
+msgstr "<option>--version</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:116
+msgid "Show the program version."
+msgstr "プログラムのバージョン情報を表示します"
+
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -8342,92 +8257,20 @@ msgstr ""
"Pin-Priority: 500\n"
"\n"
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-"\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-"\n"
-
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8435,13 +8278,13 @@ msgstr ""
"パッケージがダウングレードしても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8450,13 +8293,13 @@ msgstr ""
"含まれなくても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8465,13 +8308,13 @@ msgstr ""
"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8481,13 +8324,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8496,19 +8339,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr "P &lt; 0"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr "このバージョンのインストール禁止"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8520,7 +8363,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8534,7 +8377,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8544,7 +8387,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8574,13 +8417,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr "すると、以下のように動作します。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8595,7 +8438,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8607,7 +8450,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8621,13 +8464,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8638,30 +8481,30 @@ msgstr ""
"filename> ファイルを提供します。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr "<literal>Package:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr "パッケージ名"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr "<literal>Version:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr "その名前のパッケージのバージョン番号"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8681,13 +8524,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8704,19 +8547,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr "<literal>Codename:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -8734,14 +8577,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -8757,7 +8600,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8770,13 +8613,13 @@ msgstr ""
"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr "<literal>Component:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8794,19 +8637,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr "<literal>Origin:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8819,7 +8662,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -8827,13 +8670,13 @@ msgstr ""
"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8846,7 +8689,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -8855,7 +8698,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8879,7 +8722,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8905,13 +8748,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT 設定レコードのオプション行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8922,13 +8765,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr "安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8954,7 +8797,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8970,8 +8813,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8984,7 +8827,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8997,14 +8840,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -9018,13 +8861,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr "テスト版や不安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -9053,7 +8896,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9071,7 +8914,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -9084,14 +8927,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9110,13 +8953,13 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr "コード名リリースの進化の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9150,7 +8993,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9174,7 +9017,7 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9187,14 +9030,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9214,13 +9057,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr "&file-preferences;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -10937,29 +10780,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
#~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - "
#~ "<literal>APT::FTPArchive::MD5</literal>"
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid "Show a short usage summary."
-#~ msgstr "短い使用方法を表示します。"
-
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid "Show the program version."
-#~ msgstr "プログラムのバージョン情報を表示します"
-
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#~ msgid "to the version that is already installed (if any)."
#~ msgstr "(あるならば) 既にインストールされているバージョン。"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 0721cbf13..16b719978 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
"PO-Revision-Date: 2010-03-18 22:00+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -788,7 +788,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -1335,7 +1335,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr "opcje"
@@ -1661,13 +1661,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr "Pliki"
@@ -1679,8 +1679,8 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
msgid "See Also"
msgstr "Zobacz także"
@@ -1694,7 +1694,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnostyka"
@@ -1837,7 +1837,7 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr "Opcje"
@@ -3276,7 +3276,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Przykłady"
@@ -4753,24 +4753,8 @@ msgstr ""
"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
"Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4779,12 +4763,12 @@ msgstr ""
"opisanymi w poprzednim rozdziale."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4800,57 +4784,53 @@ msgstr ""
"kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr "Lokalna składnica zaufanych kluczy archiwum."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr "Składnica zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
"<date>9 sierpnia 2009</date>"
@@ -4867,22 +4847,13 @@ msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain"
@@ -4892,7 +4863,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4901,7 +4872,7 @@ msgstr ""
"zainstalowany automatycznie."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4917,21 +4888,14 @@ msgstr ""
"get</command> lub <command>aptitude</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
-#, fuzzy
-#| msgid ""
-#| "<literal>markauto</literal> is used to mark a package as being "
-#| "automatically installed, which will cause the package to be removed when "
-#| "no more manually installed packages depend on this package."
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4940,19 +4904,14 @@ msgstr ""
"żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
+msgstr "unmarkauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
-#| "installed, which will prevent the package from being automatically "
-#| "removed if no other packages depend on it."
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4961,98 +4920,22 @@ msgstr ""
"sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
-msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
-"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
-"osobnej linii."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:84
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
+#: apt-mark.8.xml:85
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
-msgstr ""
-"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
-"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
-"osobnej linii."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
+"installed packages with each package on a new line."
msgstr ""
"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
"osobnej linii."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:96
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
@@ -5060,7 +4943,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:97
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5069,7 +4952,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:100
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5081,19 +4964,51 @@ msgstr ""
"domyślny plik <filename>extended_status</filename> znajdujący się w katalogu "
"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
+msgstr "<option>-h</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
+msgstr "<option>--help</option>"
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
+msgstr "Wyświetla krótkie informacje na temat użytkowania."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
+msgstr "<option>-v</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
+msgstr "<option>--version</option>"
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:116
+msgid "Show the program version."
+msgstr "Wyświetla wersję programu."
+
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -7487,82 +7402,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -7572,12 +7422,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -7587,12 +7437,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7602,12 +7452,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7617,12 +7467,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -7631,17 +7481,17 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -7649,7 +7499,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -7658,14 +7508,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -7693,12 +7543,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr "Wtedy:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -7708,7 +7558,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -7716,7 +7566,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -7725,12 +7575,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7738,27 +7588,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr "linia <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr "podaje nazwę pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr "linia <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr "podaje numer wersji danego pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7771,12 +7621,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -7787,18 +7637,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr "linia <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -7809,14 +7659,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, fuzzy, no-wrap
#| msgid "Pin: release a=stable\n"
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -7826,7 +7676,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -7838,12 +7688,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr "linia <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -7854,18 +7704,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr "linia <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7874,18 +7724,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr "linia <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7894,13 +7744,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -7914,7 +7764,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -7929,12 +7779,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -7942,12 +7792,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7971,7 +7821,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7981,8 +7831,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7994,7 +7844,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8003,13 +7853,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8018,12 +7868,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -8051,7 +7901,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8062,7 +7912,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8071,13 +7921,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8089,12 +7939,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8128,7 +7978,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8143,7 +7993,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8152,13 +8002,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8170,12 +8020,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -10220,29 +10070,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
#~ msgid "<option>--md5</option>"
#~ msgstr "<option>--md5</option>"
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
-#
-#~ msgid "Show a short usage summary."
-#~ msgstr "Wyświetla krótkie informacje na temat użytkowania."
-
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
-#
-#~ msgid "Show the program version."
-#~ msgstr "Wyświetla wersję programu."
-
#
#~ msgid "APT package handling utility -- cache manipulator"
#~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 863f3dd8b..42862cc4e 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
"PO-Revision-Date: 2010-08-25 23:07+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -763,7 +763,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -1279,7 +1279,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr "opções"
@@ -1569,13 +1569,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr "Ficheiros"
@@ -1587,8 +1587,8 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
msgid "See Also"
msgstr "Veja também"
@@ -1601,7 +1601,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnóstico"
@@ -1730,7 +1730,7 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr "Opções"
@@ -3333,7 +3333,7 @@ msgstr ""
"<filename>Translation-en</filename> só pode ser criado no comando generate."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Examples"
@@ -4694,24 +4694,8 @@ msgstr ""
"Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
"remove do chaveiro as chaves de arquivo que já não são válidas."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4720,12 +4704,12 @@ msgstr ""
"secção prévia."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4742,57 +4726,53 @@ msgstr ""
"chaves são adicionadas a este."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr "Base de dados local de confiança de chaves de arquivos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"Agosto 2009</date>"
@@ -4809,22 +4789,13 @@ msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice="
@@ -4834,7 +4805,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4843,7 +4814,7 @@ msgstr ""
"sendo instalado automaticamente."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4859,21 +4830,14 @@ msgstr ""
"command> ou <command>aptitude</command> (exemplos)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
-#, fuzzy
-#| msgid ""
-#| "<literal>markauto</literal> is used to mark a package as being "
-#| "automatically installed, which will cause the package to be removed when "
-#| "no more manually installed packages depend on this package."
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4882,19 +4846,14 @@ msgstr ""
"nenhum pacote instalado manualmente depender deste pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
+msgstr "unmarkauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
-#| "installed, which will prevent the package from being automatically "
-#| "removed if no other packages depend on it."
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4903,95 +4862,21 @@ msgstr ""
"automaticamente se nenhum outro pacote depender dele."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
-msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
-"instalados automaticamente com cada pacote numa linha nova."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:84
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
+#: apt-mark.8.xml:85
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
-msgstr ""
-"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
-"instalados automaticamente com cada pacote numa linha nova."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
+"installed packages with each package on a new line."
msgstr ""
"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
"instalados automaticamente com cada pacote numa linha nova."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:96
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
@@ -4999,7 +4884,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:97
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5008,7 +4893,7 @@ msgstr ""
"filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:100
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5020,18 +4905,48 @@ msgstr ""
"localização predefinida, a qual é <filename>extended_status</filename> no "
"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
+msgstr "<option>-h</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
+msgstr "<option>--help</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
+msgstr "Mostra um curto sumário de utilização."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
+msgstr "<option>-v</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:116
+msgid "Show the program version."
+msgstr "Mostra a versão do programa."
+
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -8285,84 +8200,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta as Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8371,12 +8219,12 @@ msgstr ""
"na versão do pacote (downgrade)"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8385,12 +8233,12 @@ msgstr ""
"destino, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8400,12 +8248,12 @@ msgstr ""
"mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8415,12 +8263,12 @@ msgstr ""
"recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8429,17 +8277,17 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
msgid "prevents the version from being installed"
msgstr "previne a instalação da versão"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8450,7 +8298,7 @@ msgstr ""
"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8464,7 +8312,7 @@ msgstr ""
"determina a prioridade da versão de pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8473,7 +8321,7 @@ msgstr ""
"registos apresentados atrás:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8501,12 +8349,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr "Então:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8521,7 +8369,7 @@ msgstr ""
"downgrade ao <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8532,7 +8380,7 @@ msgstr ""
"versões, mesmo versões que pertencem ao lançamento de destino."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8545,12 +8393,12 @@ msgstr ""
"instalação e se nenhuma versão do pacote já estiver instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8561,27 +8409,27 @@ msgstr ""
"descrever os pacotes disponíveis nessa localização."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
msgid "gives the package name"
msgstr "fornece o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
msgid "gives the version number for the named package"
msgstr "fornece o número de versão do pacote nomeado"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8602,12 +8450,12 @@ msgstr ""
"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8624,18 +8472,18 @@ msgstr ""
"requerer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8652,13 +8500,13 @@ msgstr ""
"preferências do APT requer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
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 "
@@ -8674,7 +8522,7 @@ msgstr ""
"seguintes linhas:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8686,12 +8534,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8709,18 +8557,18 @@ msgstr ""
"a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8733,18 +8581,18 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8757,13 +8605,13 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8786,7 +8634,7 @@ msgstr ""
"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8811,12 +8659,12 @@ msgstr ""
"literal> da distribuição <literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais num Registo de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8827,12 +8675,12 @@ msgstr ""
"literal>. Isto disponibiliza um espaço para comentários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
msgid "Tracking Stable"
msgstr "Acompanhando Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8856,7 +8704,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8872,8 +8720,8 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8885,7 +8733,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8898,13 +8746,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8917,12 +8765,12 @@ msgstr ""
"outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Package: *\n"
@@ -8950,7 +8798,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8967,7 +8815,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8980,13 +8828,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9005,12 +8853,12 @@ msgstr ""
"versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr "Acompanhando a evolução de um nome de código de lançamento"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9044,7 +8892,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9070,7 +8918,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9083,13 +8931,13 @@ msgstr ""
"codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9108,12 +8956,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -11142,27 +10990,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-
-#~ msgid "Show a short usage summary."
-#~ msgstr "Mostra um curto sumário de utilização."
-
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
-#~ msgid "Show the program version."
-#~ msgstr "Mostra a versão do programa."
-
#~ msgid "to the version that is already installed (if any)."
#~ msgstr "para a versão que já está instalada (se alguma)."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 488350186..5a8db4dd5 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2011-06-08 16:54+0300\n"
+"POT-Creation-Date: 2011-04-05 10:22+0300\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -578,7 +578,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
+#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
#, fuzzy
@@ -963,7 +963,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
msgid "options"
msgstr ""
@@ -1209,13 +1209,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
+#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
msgid "Files"
msgstr ""
@@ -1227,8 +1227,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
+#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
#: sources.list.5.xml:234
#, fuzzy
msgid "See Also"
@@ -1242,7 +1242,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr ""
@@ -1341,7 +1341,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:158
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
msgid "Options"
msgstr ""
@@ -2611,7 +2611,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
#: sources.list.5.xml:198
#, fuzzy
msgid "Examples"
@@ -3642,29 +3642,15 @@ msgid ""
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-msgid "net-update"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
-msgid ""
-"Update the local keyring with the keys of a key server and removes from the "
-"keyring the archive keys which are no longer valid. This requires an "
-"installed wget and an APT build configured to have a server to fetch from. "
-"APT in Debian does not support this command, but Ubuntu's APT does."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:143
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:145
#, fuzzy
msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
@@ -3672,7 +3658,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:146
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3683,44 +3669,44 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:175
+#: apt-key.8.xml:159
msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:161
#, fuzzy
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt.conf</>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:162
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:165
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:166
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:169
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:170
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:195
+#: apt-key.8.xml:179
#, fuzzy
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -3729,8 +3715,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -3749,21 +3735,20 @@ msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:56
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:60
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3773,132 +3758,108 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-msgid "auto"
+#: apt-mark.8.xml:68
+msgid "markauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:69
msgid ""
-"<literal>auto</literal> is used to mark a package as being automatically "
+"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
+#: apt-mark.8.xml:76
+msgid "unmarkauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:77
msgid ""
-"<literal>manual</literal> is used to mark a package as being manually "
+"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
+#: apt-mark.8.xml:84
+msgid "showauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:85
msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
-"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."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:96
msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
-msgid "showauto"
+#: apt-mark.8.xml:97
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:100
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line. All automatically "
-"installed packages will be listed if no package is given. If packages are "
-"given only those which are automatically installed will be shown."
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of 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><varlistentry><term>
-#: apt-mark.8.xml:109
-msgid "showmanual"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
-msgid ""
-"<literal>showmanual</literal> can be used in the same way as "
-"<literal>showauto</literal> except that it will print a list of manually "
-"installed packages instead."
+#: apt-mark.8.xml:106
+msgid "<option>-h</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-msgid "showhold"
+#: apt-mark.8.xml:107
+msgid "<option>--help</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
+#: apt-mark.8.xml:108
+msgid "Show a short usage summary."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#: apt-mark.8.xml:114
+msgid "<option>-v</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#: apt-mark.8.xml:115
+msgid "<option>--version</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:116
+msgid "Show the program version."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:127
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:132
#, fuzzy
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -6389,78 +6350,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:264
-msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:273
-#, fuzzy, no-wrap
-msgid ""
-"Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
-"Pin-Priority: 500\n"
-msgstr ""
-"<programlisting>\n"
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:279
-msgid ""
-"The rule for those expressions is that they can occur anywhere where a "
-"string can occur. Those, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:285
-#, fuzzy, no-wrap
-msgid ""
-"Package: *\n"
-"Pin: release n=karmic*\n"
-"Pin-Priority: 990\n"
-msgstr ""
-"<programlisting>\n"
-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:263
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:271
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:272
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -6470,13 +6372,13 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:276
#, fuzzy
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:277
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -6486,13 +6388,13 @@ msgstr ""
"versão alvo, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:282
#, fuzzy
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:283
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6502,13 +6404,13 @@ msgstr ""
"disponível pertencente a versão alvo ou a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:288
#, fuzzy
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:289
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6519,13 +6421,13 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:294
#, fuzzy
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt;= P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:295
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -6535,19 +6437,19 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:299
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:300
#, fuzzy
msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:266
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6559,7 +6461,7 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:305
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -6575,7 +6477,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:311
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -6585,7 +6487,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:315
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6614,12 +6516,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:328
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:330
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -6635,7 +6537,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:335
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -6647,7 +6549,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:339
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -6662,13 +6564,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:349
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:351
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -6680,31 +6582,31 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:363
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:364
#, fuzzy
msgid "gives the package name"
msgstr "informa o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:368
#, fuzzy
msgid "gives the version number for the named package"
msgstr "informa o número de versão do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:355
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -6726,13 +6628,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:384
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:385
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -6750,7 +6652,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:395
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -6758,13 +6660,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:401
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:402
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -6782,7 +6684,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:411
#, fuzzy, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
@@ -6790,7 +6692,7 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:418
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -6807,7 +6709,7 @@ msgstr ""
"das linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:427
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6820,13 +6722,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:436
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:437
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -6845,7 +6747,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:446
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -6853,13 +6755,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:452
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:453
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -6873,7 +6775,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:459
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -6881,13 +6783,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:465
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:466
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -6900,7 +6802,7 @@ msgstr ""
"arquivo de preferências do APT iria requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:472
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -6908,7 +6810,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:373
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -6932,7 +6834,7 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:479
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6958,13 +6860,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:492
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais em um Registro de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:494
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -6976,13 +6878,13 @@ msgstr ""
"</literal>. Isto oferece um local para inserir comentários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:503
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:511
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7007,7 +6909,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:505
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -7023,8 +6925,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
+#: apt_preferences.5.xml:632
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7037,7 +6939,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:523
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7050,7 +6952,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:540
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -7058,7 +6960,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:534
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7071,13 +6973,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:546
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:555
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7106,7 +7008,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -7123,7 +7025,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:569
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7136,7 +7038,7 @@ msgstr ""
"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:589
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -7144,7 +7046,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:580
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7164,12 +7066,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:596
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:610
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7199,7 +7101,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:598
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7214,7 +7116,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:627
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7227,7 +7129,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:647
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -7235,7 +7137,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:638
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7255,13 +7157,13 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:656
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:662
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"