summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-secure.8.xml2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/external-dependency-solver-protocol.txt28
-rw-r--r--doc/po/apt-doc.pot8
-rw-r--r--doc/po/de.po124
-rw-r--r--doc/po/es.po8
-rw-r--r--doc/po/fr.po8
-rw-r--r--doc/po/it.po8
-rw-r--r--doc/po/ja.po8
-rw-r--r--doc/po/pl.po8
-rw-r--r--doc/po/pt.po8
-rw-r--r--doc/po/pt_BR.po6
12 files changed, 118 insertions, 100 deletions
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 981351615..15a73476d 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -193,7 +193,7 @@
<refsect1><title>See Also</title>
<para>
&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
-&debsign; &debsig-verify;, &gpg;
+&debsign;, &debsig-verify;, &gpg;
</para>
<para>For more background information you might want to review the
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 51ad08b83..00d8eb7e9 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0.4">
+<!ENTITY apt-product-version "1.0.5">
<!-- (Code)names for various things used all over the place -->
<!ENTITY oldstable-codename "squeeze">
diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt
index 790f2f1ee..14e9528c8 100644
--- a/doc/external-dependency-solver-protocol.txt
+++ b/doc/external-dependency-solver-protocol.txt
@@ -5,6 +5,14 @@ external dependency solvers. The protocol is called APT EDSP, for "APT
External Dependency Solver Protocol".
+## Terminology
+
+In the following we use the term **architecture qualified package name**
+(or *arch-qualified package names* for short) to refer to package
+identifiers of the form "package:arch" where "package" is a package name
+and "arch" a dpkg architecture.
+
+
## Components
- **APT**: we know this one.
@@ -62,6 +70,7 @@ configuration documentation for more, and more up to date, information.
- **Dir::Bin::Solvers**: absolute path of the directory where to look for
external solvers. Defaults to `/usr/lib/apt/solvers`.
+
## Protocol
When configured to use an external solver, APT will resort to it to
@@ -132,9 +141,9 @@ The following **configuration fields** are supported in request stanzas:
The following **action fields** are supported in request stanzas:
- **Install:** (optional, defaults to the empty string) A space
- separated list of package names, with *no version attached*, to
- install. This field denotes a list of packages that the user wants to
- install, usually via an APT `install` request.
+ separated list of arch-qualified package names, with *no version
+ attached*, to install. This field denotes a list of packages that the
+ user wants to install, usually via an APT `install` request.
- **Remove:** (optional, defaults to the empty string) Same syntax of
Install. This field denotes a list of packages that the user wants to
@@ -201,7 +210,7 @@ field. The following fields are supported in package stanzas:
- **APT-Candidate:** (optional, defaults to `no`). Allowed values:
`yes`, `no`. When set to `yes`, the corresponding package is the APT
candidate for installation among all available packages with the same
- name.
+ name and architecture.
- **APT-Automatic:** (optional, defaults to `no`). Allowed values:
`yes`, `no`. When set to `yes`, the corresponding package is marked by
@@ -218,6 +227,7 @@ field. The following fields are supported in package stanzas:
Release file entry (Origin, Label, Codename, etc.) in the format of
APT_PREFERENCES(5).
+
### Answer
An answer from the external solver to APT is either a *solution* or an
@@ -226,11 +236,11 @@ An answer from the external solver to APT is either a *solution* or an
The following invariant on **exit codes** must hold true. When the
external solver is *able to find a solution*, it will write the solution
to standard output and then exit with an exit code of 0. When the
-external solver is *unable to find a solution* (and s aware of that), it
-will write an error to standard output and then exit with an exit code
-of 0. An exit code other than 0 will be interpreted as a solver crash
-with no meaningful error about dependency resolution to convey to the
-user.
+external solver is *unable to find a solution* (and is aware of that),
+it will write an error to standard output and then exit with an exit
+code of 0. An exit code other than 0 will be interpreted as a solver
+crash with no meaningful error about dependency resolution to convey to
+the user.
#### Solution
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a058e6506..c73bed18e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 1.0.4~20140610\n"
+"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-10 15:59+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2153,7 +2153,7 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6242,7 +6242,7 @@ msgstr ""
#: guide.sgml:163
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/de.po b/doc/po/de.po
index e5b61da60..c3cf0f52c 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,14 @@
-# Translation of apt-doc to German
+# 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.
+# This file is distributed under the same license as the apt package.
# Chris Leick <c.leick@vollbio.de>, 2009-2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.16\n"
+"Project-Id-Version: apt-doc 1.0.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
+"PO-Revision-Date: 2014-06-12 20:31+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
@@ -633,7 +633,7 @@ msgstr "APT"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt.8.xml:32
msgid "command-line interface"
-msgstr ""
+msgstr "Befehlszeilenschnittstelle"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
@@ -652,6 +652,11 @@ msgid ""
"management of the system. See also &apt-get; and &apt-cache; for more low-"
"level command options."
msgstr ""
+"<command>apt</command> (Advanced Package Tool, auf Deutsch "
+"»fortschrittliches Paketwerkzeug«) ist das Befehlszeilenwerkzeug für den "
+"Umgang mit Paketen. Es stellt eine Befehlszeilenschnittstelle zur Verwaltung "
+"von Paketen auf dem System bereit. Weitere untergeordnete Befehlsoptionen "
+"finden sie unter &apt-get; und &apt-cache;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:47
@@ -661,6 +666,10 @@ msgid ""
"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
"versions</option> are supported."
msgstr ""
+"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
+"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
+"folgenden Optionen werden unterstützt: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--all-versions</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:58
@@ -668,19 +677,17 @@ msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
msgstr ""
+"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
+"passende Pakete an."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:64
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
msgstr ""
-"<literal>rdepends</literal> zeigt eine Liste von jeder "
-"Rückwärtsabhängigkeit, die ein Paket hat."
+"<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
+"Pakete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:71
@@ -688,6 +695,8 @@ msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
msgstr ""
+"<literal>install</literal> ist gefolgt von einem oder mehreren Paketnamen, "
+"von denen eine Installation oder ein Upgrade gewünscht wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:75 apt-get.8.xml:118
@@ -717,7 +726,7 @@ msgid ""
"installed instead of removed."
msgstr ""
"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
-"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, "
+"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
@@ -728,19 +737,17 @@ msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
+"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
+"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
msgstr ""
-"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
-"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
+"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit "
+"ihren Quellen in Einklang zu bringen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:105
@@ -750,6 +757,10 @@ msgid ""
"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
"but existing package will never removed."
msgstr ""
+"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
+"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
+"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
+"neue Pakete installiert, existierende jedoch nicht entfernt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:114
@@ -758,6 +769,9 @@ msgid ""
"also remove installed packages if that is required in order to resolve a "
"package conflict."
msgstr ""
+"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
+"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
+"Paketkonflikts nötig ist."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
@@ -769,7 +783,7 @@ msgstr "Optionen"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:134
msgid "Script usage"
-msgstr ""
+msgstr "Skriptaufruf"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:136
@@ -780,11 +794,17 @@ msgid ""
"&apt-cache; and &apt-get; via APT options. Please prefer using these "
"commands in your scripts."
msgstr ""
+"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann die "
+"Ausgabe zwischen Versionen ändern. Obwohl es versucht, nicht die "
+"Abwärtskompatibilität zu unterbrechen, gibt es dafür keine Garantie. Alle "
+"Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über APT-"
+"Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in Ihren "
+"Skripten."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:144
msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Unterschiede zu &apt-get;"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:145
@@ -793,20 +813,19 @@ msgid ""
"does not need to be backward compatible like &apt-get;. Therefore some "
"options are different:"
msgstr ""
+"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
+"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
+"get;. Daher unterscheiden sich einige Optionen:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "die <literal>Package:</literal>-Zeile"
+msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "die <literal>Component:</literal>-Zeile"
+msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:159
@@ -814,15 +833,17 @@ msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
+"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg "
+"--list</literal> ähnlich."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
-msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
+msgstr ""
+"Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--with-"
+"new-pkgs</literal> aktiviert."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
@@ -835,18 +856,12 @@ msgstr "Siehe auch"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:175
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
-#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
-"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, "
-"das APT-Howto."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, die APT-"
+"Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
@@ -857,16 +872,12 @@ msgstr "Diagnose"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:181
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
-"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal "
-"100 bei Fehlern."
+"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal 100 "
+"bei Fehlern."
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-get.8.xml:35
@@ -1039,7 +1050,7 @@ msgid ""
"you wish to upgrade, and if a newer version is available, it (and its "
"dependencies, as described above) will be downloaded and installed."
msgstr ""
-"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie Sie ein Upgrade "
+"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie ein Upgrade "
"eines oder mehrerer bereits installierter Pakete durchführen möchten, ohne "
"ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuführen. "
"Anders als das Ziel von »upgrade«, das die neusten Versionen aller aktuell "
@@ -1766,13 +1777,6 @@ msgstr ""
# FIXME s/Item/Items/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:535
-#, fuzzy
-#| msgid ""
-#| "Show user friendly progress information in the terminal window when "
-#| "packages are installed, upgraded or removed. For a machine parsable "
-#| "version of this data see README.progress-reporting in the apt doc "
-#| "directory. Configuration Item: <literal>DpkgPM::Progress</literal> and "
-#| "<literal>Dpkg::Progress-Fancy</literal>."
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1783,9 +1787,9 @@ msgstr ""
"zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
"Pakete installiert beziehungsweise entfernt werden oder ein Upgrade "
"durchgeführt wird. Informationen über eine maschinell auswertbare Version "
-"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. "
-"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und "
-"<literal>Dpkg::Progress-Fancy</literal>."
+"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. "
+"Konfigurationselemente: <literal>Dpkg::Progress</literal> und <literal>Dpkg::"
+"Progress-Fancy</literal>."
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
@@ -3005,10 +3009,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199
@@ -5434,6 +5438,9 @@ msgid ""
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
msgstr ""
+"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies "
+"schließt z.B. die Konfigurationsoptionen <literal>DPkg::{Pre,Post}-Invoke</"
+"literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
@@ -8834,6 +8841,7 @@ msgstr ""
"Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
"Entscheidungen können manchmal ziemlich überraschend sein."
+# s/package/packages/
#. type: <p></p>
#: guide.sgml:163
#, fuzzy
@@ -8847,7 +8855,7 @@ msgstr ""
#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/es.po b/doc/po/es.po
index 2cf3a070a..7a2abcf54 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -3098,10 +3098,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199
@@ -8897,7 +8897,7 @@ msgstr ""
#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 530de5046..efb94fb54 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -3022,10 +3022,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199
@@ -8857,7 +8857,7 @@ msgstr ""
#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/it.po b/doc/po/it.po
index c5ef090ff..8726bcaf3 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -3033,10 +3033,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199
@@ -8817,7 +8817,7 @@ msgstr ""
#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 2475b810d..f8e3d8ad1 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -2963,10 +2963,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199
@@ -8440,7 +8440,7 @@ msgstr ""
#: guide.sgml:163
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 5f92c521c..2849d190a 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-01 13:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -3131,10 +3131,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199
@@ -8097,7 +8097,7 @@ msgstr ""
#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 6ebf93bc7..f32da9bfd 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\n"
"PO-Revision-Date: 2014-04-01 13:59+0200\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -3042,10 +3042,10 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:199
@@ -8806,7 +8806,7 @@ msgstr ""
#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index e9e785f08..f633ae0f9 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-05-05 16:26+0200\n"
+"POT-Creation-Date: 2014-06-18 14:12+0200\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"
@@ -2159,7 +2159,7 @@ msgstr ""
#: apt-secure.8.xml:195
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6647,7 +6647,7 @@ msgstr ""
#: guide.sgml:163
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "