summaryrefslogtreecommitdiff
path: root/doc/po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2013-07-02 17:10:12 +0200
committerMichael Vogt <mvo@ubuntu.com>2013-07-02 17:10:12 +0200
commit4468de5560944f0c651f91111ba8940b639c792e (patch)
tree57ffe01ab72edb06bbb26a23ba653b4a7379f138 /doc/po
parent71de6e782f56aa22b7aba730baeee291e9c62401 (diff)
make update-po
Diffstat (limited to 'doc/po')
-rw-r--r--doc/po/apt-doc.pot42
-rw-r--r--doc/po/de.po119
-rw-r--r--doc/po/es.po83
-rw-r--r--doc/po/fr.po85
-rw-r--r--doc/po/it.po71
-rw-r--r--doc/po/ja.po80
-rw-r--r--doc/po/pl.po72
-rw-r--r--doc/po/pt.po94
-rw-r--r--doc/po/pt_BR.po62
9 files changed, 405 insertions, 303 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 43c184106..85368895d 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 0.9.8.1\n"
+"Project-Id-Version: apt-doc 0.9.9ubuntu1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+"POT-Creation-Date: 2013-07-02 17:09+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"
@@ -1110,7 +1110,7 @@ msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "See Also"
msgstr ""
@@ -1123,7 +1123,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
+#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr ""
@@ -1620,8 +1620,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1670,22 +1670,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -2060,13 +2060,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: "
+"<literal>Acquire::cdrom::AutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
+msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2074,7 +2082,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: "
@@ -2082,7 +2090,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2091,7 +2099,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2099,7 +2107,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -2107,12 +2115,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
diff --git a/doc/po/de.po b/doc/po/de.po
index 7ef5d39c0..48804dd4c 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,11 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -767,9 +763,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1553,7 +1549,7 @@ msgstr "Dateien"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1573,7 +1569,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr "Diagnose"
@@ -2899,6 +2895,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Einhängepunkt; gibt den Ort an, an dem die CD-ROM eingehängt wird. Dieser "
+"Einhängepunkt muss in <filename>/etc/fstab</filename> eingetragen und "
+"angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::"
+"cdrom::mount</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -2910,7 +2923,7 @@ msgstr ""
"cdrom::mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2922,7 +2935,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2933,7 +2946,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2946,7 +2959,7 @@ msgstr ""
"festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2957,7 +2970,7 @@ msgstr ""
"Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -2968,12 +2981,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3807,12 +3820,12 @@ msgid ""
"be used."
msgstr ""
"<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er "
-"wird standardmäßig in der Form <literal>http://[[Anwender][:"
-"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann "
-"außerdem in der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem "
-"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass "
-"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben "
-"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
+"wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]"
+"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in "
+"der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem speziellen "
+"Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies "
+"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird "
+"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:366
@@ -5051,15 +5064,15 @@ msgstr ""
"auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem "
"Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</"
"literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> "
-"gefolgt von <literal>Paketname &lt;a.b.c -&gt; d.e.f | x.y.z&gt; "
-"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version "
-"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur "
-"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version "
-"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer "
-"niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, "
-"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die "
-"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in "
-"dem das Paket erscheint."
+"gefolgt von <literal>Paketname &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (Abschnitt)"
+"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes "
+"ist, <literal>d.e.f</literal> die Version ist, die zur Installation "
+"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die "
+"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-"
+"Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt "
+"oder wenn sie die gleiche Version haben, wie die, die installiert ist. "
+"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket "
+"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:1061
@@ -6304,9 +6317,9 @@ msgid ""
"id=\"0\"/>"
msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
-"neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste"
+"(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type="
+"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:584
@@ -6387,9 +6400,9 @@ msgid ""
"id=\"0\"/>"
msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
-"neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste"
+"(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type="
+"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:633
@@ -6492,8 +6505,8 @@ msgid ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
-"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte"
+"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</"
"literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -6661,13 +6674,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> könnte außerdem eine Variable, <literal>"
"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie "
@@ -8186,9 +8199,9 @@ msgstr "BESCHREIBUNG"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche "
"Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die "
@@ -8773,9 +8786,9 @@ msgstr ""
"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
-"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. "
-"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get "
-"update</tt> ausgeführt wurde."
+"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]"
+"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</"
+"tt> ausgeführt wurde."
#. type: <p></p>
#: guide.sgml:253
diff --git a/doc/po/es.po b/doc/po/es.po
index a6fbc5da2..b4f90bbe6 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,11 +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"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -852,9 +848,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1629,7 +1625,7 @@ msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1649,7 +1645,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -2963,6 +2959,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Punto de montaje. Define el lugar donde se debe montar el disco óptico. El "
+"punto de montaje debe aparecer en <filename>/etc/fstab</filename> y estar "
+"correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::"
+"mount</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -2974,7 +2987,7 @@ msgstr ""
"mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2986,7 +2999,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2996,7 +3009,7 @@ msgstr ""
"de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3009,7 +3022,7 @@ msgstr ""
"de configuración: <literal>APT::CDROM::Fast</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3021,7 +3034,7 @@ msgstr ""
"pero encontrará todo el contenido."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -3032,12 +3045,12 @@ msgstr ""
"CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -6684,18 +6697,18 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
-msgstr ""
-"<literal>distribución</literal> puede contener una variable, <literal>"
-"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el "
-"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). "
-"Esto permite que los ficheros <filename>sources.list</filename> sean "
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
+msgstr ""
+"<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)"
+"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema "
+"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto "
+"permite que los ficheros <filename>sources.list</filename> sean "
"independientes de la arquitectura. En general, esta característica sólo es "
"de interés si se especifica una ruta completa, de lo contrario <literal>APT</"
"literal> generará automáticamente una URI con la arquitectura actual del "
@@ -8199,9 +8212,9 @@ msgstr "DESCRIPCIÓN"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT es un sistema de gestión de paquetes de software. Dispone de varias "
"interfaces para la gestión de paquetes normal del día a día, tales como "
@@ -8771,9 +8784,9 @@ msgid ""
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
msgstr ""
-"Es necesario actualizar la lista disponible mediante el elemento de menú "
-"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto "
-"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
+"Es necesario actualizar la lista disponible mediante el elemento de menú [A]"
+"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de "
+"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
"información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado "
"<tt>apt-get update</tt> con anterioridad."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 41358cfa2..286a20db7 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,11 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
"PO-Revision-Date: 2013-04-09 07:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -764,9 +760,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -828,10 +824,10 @@ msgstr ""
"déjà installés sans mettre à jour les autres paquets du système. À la "
"différence de la commande « upgrade » qui installera la dernière version "
"disponible de tous les paquets installés au moment de son exécution, "
-"« install » n'installera la nouvelle version que pour le(s) paquet(s) "
-"indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et "
-"si une nouvelle version est disponible, cette version (et ses dépendances, "
-"comme décrit plus haut) sera récupérée et installée."
+"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué"
+"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une "
+"nouvelle version est disponible, cette version (et ses dépendances, comme "
+"décrit plus haut) sera récupérée et installée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:137
@@ -1548,7 +1544,7 @@ msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1568,7 +1564,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -2887,6 +2883,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Point de montage ; spécifie l'emplacement de montage du CD. Ce point de "
+"montage doit être spécifié dans <filename>/etc/fstab</filename> et "
+"correctement configuré. Élément de configuration : <literal>Acquire::cdrom::"
+"mount</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -2898,7 +2911,7 @@ msgstr ""
"mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2910,7 +2923,7 @@ msgstr ""
"<literal>APT::CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2921,7 +2934,7 @@ msgstr ""
"NoMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2935,7 +2948,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2947,7 +2960,7 @@ msgstr ""
"le CD mais tous les paquets seront repérés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -2958,12 +2971,12 @@ msgstr ""
"<literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -6632,13 +6645,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> peut aussi contenir une variable <literal>"
"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme "
@@ -8142,9 +8155,9 @@ msgstr "DESCRIPTION"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT est un système de gestion de paquets logiciels. Pour la gestion au "
"quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en "
@@ -8758,11 +8771,11 @@ msgid ""
"[R]emove commands have no meaning, the [I]nstall command performs both of "
"them together."
msgstr ""
-"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option "
-"« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » "
-"pour les installer. Lorsque la méthode APT est utilisée, les options "
-"« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » "
-"fait l'ensemble des opérations."
+"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]"
+"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour "
+"les installer. Lorsque la méthode APT est utilisée, les options « [C]"
+"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait "
+"l'ensemble des opérations."
#. type: <p></p>
#: guide.sgml:258
diff --git a/doc/po/it.po b/doc/po/it.po
index f6754c1fb..2d432c6cc 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,11 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -816,9 +812,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1592,7 +1588,7 @@ msgstr "File"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1612,7 +1608,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr "Diagnostica"
@@ -2930,6 +2926,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Punto di mount; specifica la posizione in cui montare il CD-ROM. Questo "
+"punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> "
+"e configurato correttamente. Voce di configurazione: <literal>Acquire::"
+"cdrom::mount</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -2941,7 +2954,7 @@ msgstr ""
"cdrom::mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2953,7 +2966,7 @@ msgstr ""
"Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2964,7 +2977,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2977,7 +2990,7 @@ msgstr ""
"errore. Voce di configurazione: <literal>APT::CDROM::Fast</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2989,7 +3002,7 @@ msgstr ""
"più tempo, ma troverà tutti i file."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -3000,12 +3013,12 @@ msgstr ""
"<literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -6667,13 +6680,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribuzione</literal> può anche contenere una variabile <literal>"
"$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
@@ -8168,9 +8181,9 @@ msgstr "DESCRIZIONE"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT è un sistema di gestione per i pacchetti software. Per la normale "
"gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali "
@@ -8224,8 +8237,8 @@ msgid ""
"B<reportbug>(1) command."
msgstr ""
"Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, "
-"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando "
-"B<reportbug>(1)."
+"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>"
+"(1)."
#. type: SH
#: apt.8:51
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 866cf0e43..659f8c77b 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,11 +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"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -804,9 +800,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1540,7 +1536,7 @@ msgstr "ファイル"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1560,7 +1556,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -2830,6 +2826,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"マウントポイント - CD-ROM をマウントする場所を指定します。このマウントポイン"
+"トは、<filename>/etc/fstab</filename> に正しく設定されている必要があります。"
+"設定項目: <literal>Acquire::cdrom::mount</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -2840,7 +2852,7 @@ msgstr ""
"設定項目: <literal>Acquire::cdrom::mount</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2851,7 +2863,7 @@ msgstr ""
"を入力するよう促します。設定項目: <literal>APT::CDROM::Rename</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2862,7 +2874,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2875,7 +2887,7 @@ msgstr ""
"<literal>APT::CDROM::Fast</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2887,7 +2899,7 @@ msgstr ""
"できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -2898,12 +2910,12 @@ msgstr ""
"CDROM::NoAct</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3843,10 +3855,10 @@ msgstr ""
"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す"
"る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ"
"ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ"
-"い。URI を構成するコンポーネントに対応する置換変数は、<literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal>, <literal>$(SITE_PORT)</literal> です。"
+"い。URI を構成するコンポーネントに対応する置換変数は、<literal>$(PROXY_USER)"
+"</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</"
+"literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, "
+"<literal>$(SITE_PORT)</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:451
@@ -6380,13 +6392,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
"があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian "
@@ -7836,14 +7848,14 @@ msgstr "説明"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
-"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の "
-"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか"
-"のオプションは B<apt-get>(8) にしか実装されていません。"
+"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>"
+"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ"
+"ンは B<apt-get>(8) にしか実装されていません。"
#. type: SH
#: apt.8:31
diff --git a/doc/po/pl.po b/doc/po/pl.po
index ee4461f39..b89d992a0 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,11 +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"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -815,9 +811,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1623,7 +1619,7 @@ msgstr "Pliki"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1644,7 +1640,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr "Diagnostyka"
@@ -2998,6 +2994,24 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Punkt montowania. Podaje lokalizację katalogu, w którym będzie zamontowany "
+"CD-ROM. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w "
+"pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: "
+"<literal>Acquire::cdrom::mount</literal>."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -3010,7 +3024,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3023,7 +3037,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -3035,7 +3049,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -3050,7 +3064,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -3063,7 +3077,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -3075,13 +3089,13 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -6103,13 +6117,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</"
"literal>, która zostanie rozwinięta do architektury Debiana (takiej jak "
@@ -7418,9 +7432,9 @@ msgstr "OPIS"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek "
"przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), "
@@ -7706,8 +7720,8 @@ msgstr ""
"Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw "
"ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</"
"p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest "
-"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources."
-"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
+"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list"
+"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
"pomocą polecenia <tt>apt-get update</tt>. Na przykład:"
#. type: <example></example>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 79d90d65b..9342b2fda 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,11 +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"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+0300\n"
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -813,9 +809,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1576,7 +1572,7 @@ msgstr "Ficheiros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1596,7 +1592,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr "Diagnóstico"
@@ -2907,6 +2903,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
+#, fuzzy
+#| msgid ""
+#| "Mount point; specify the location to mount the CD-ROM. This mount point "
+#| "must be listed in <filename>/etc/fstab</filename> and properly "
+#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto "
+"de montagem deve estar listado em <filename>/etc/fstab</filename> e "
+"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
+"mount</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -2918,7 +2931,7 @@ msgstr ""
"mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2930,7 +2943,7 @@ msgstr ""
"CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2941,7 +2954,7 @@ msgstr ""
"NoMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2954,7 +2967,7 @@ msgstr ""
"configuração: <literal>APT::CDROM::Fast</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2965,7 +2978,7 @@ msgstr ""
"estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -2976,12 +2989,12 @@ msgstr ""
"configuração: <literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3796,12 +3809,12 @@ msgid ""
"be used."
msgstr ""
"<literal>http::Proxy</literal> define o proxy http predefinido a usar para "
-"URIs de HTTP. Está no formato standard de <literal>http://[[user][:"
-"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por "
-"máquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a "
-"palavra chave especial <literal>DIRECT</literal> que significa não usar "
-"proxies. Se nenhuma das definições acima for especificada, será usada a "
-"variável de ambiente <envar>http_proxy</envar>."
+"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]"
+"host[:port]/</literal>. Também podem ser especificados proxies por máquina "
+"ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a palavra "
+"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se "
+"nenhuma das definições acima for especificada, será usada a variável de "
+"ambiente <envar>http_proxy</envar>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:366
@@ -3974,9 +3987,8 @@ msgstr ""
"servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
"exemplo de como fazer isto. As variáveis de substituição que representam o "
"componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>"
-"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</"
-"literal>."
+"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)"
+"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:451
@@ -6604,13 +6616,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> também pode conter uma variável. <literal>"
"$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
@@ -8107,9 +8119,9 @@ msgstr "DESCRIÇÃO"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT é um sistema de gestão para pacotes de software. Para a gestão de "
"pacotes normal do dia-a-dia existem vários frontends disponíveis, como o "
@@ -8388,11 +8400,11 @@ msgid ""
"instance,"
msgstr ""
"O primeira <footnote><p>se você está a usar um servidor proxy http você tem "
-"que definir a variável de ambiente http_proxy primeiro, veja sources."
-"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</"
-"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que "
-"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get "
-"update</tt>. Por exemplo,"
+"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)"
+"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> "
+"é obter as listas de pacotes a partir das <em>Sources</em> para que ele "
+"saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</"
+"tt>. Por exemplo,"
#. type: <example></example>
#: guide.sgml:116
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index a415d9528..7b105cf47 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,11 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
-=======
-"POT-Creation-Date: 2013-06-13 13:46+0300\n"
->>>>>>> upstream/debian/sid
+"POT-Creation-Date: 2013-07-02 17:09+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"
@@ -590,9 +586,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the "
-"package(s) specified for installation will also be retrieved and installed. "
-"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed. The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1101,7 +1097,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109
#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
@@ -1119,7 +1115,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
msgid "Diagnostics"
msgstr ""
@@ -2065,13 +2061,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:85
msgid ""
+"Do not try to auto-detect the CD-ROM path. Usually combined with the "
+"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:93
+msgid ""
"Mount point; specify the location to mount the CD-ROM. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:102
msgid ""
"Rename a disc; change the label of a disc or override the disc's given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2079,7 +2083,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:111
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2087,7 +2091,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:111
+#: apt-cdrom.8.xml:119
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2096,7 +2100,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:129
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2104,7 +2108,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:140
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -2112,13 +2116,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:145
+#: apt-cdrom.8.xml:153
#, fuzzy
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:150
+#: apt-cdrom.8.xml:158
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -4843,8 +4847,8 @@ msgid ""
"id=\"0\"/>"
msgstr ""
"Com um arquivo &sources-list; adequado e o arquivo de preferências do APT "
-"acima, quaisquer dos comandos a seguir farão com que o APT atualize para "
-"a(s) última(s) versão(ões) <literal>testing</literal>."
+"acima, quaisquer dos comandos a seguir farão com que o APT atualize para a"
+"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:633
@@ -5064,13 +5068,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6191,9 +6195,9 @@ msgstr ""
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
-"System. Some options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as B<aptitude>"
+"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
+"options are only implemented in B<apt-get>(8) though."
msgstr ""
#. type: SH