summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJustin B Rye <jbr@edlug.org.uk>2012-05-29 15:39:41 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-05-29 15:39:41 +0200
commit6cbb88de9417ce776e3488cf3495eb8fed3efe0c (patch)
tree29d65d9f44c4745925ecef5f55dd6512fe53e447 /doc
parentc6b21d22dcbc2fbecca4e5db27315331d687d1a0 (diff)
* doc/apt-get.8.xml:
- move dselect-upgrade below dist-upgrade
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-get.8.xml20
-rw-r--r--doc/po/apt-doc.pot26
-rw-r--r--doc/po/de.po56
-rw-r--r--doc/po/es.po54
-rw-r--r--doc/po/fr.po56
-rw-r--r--doc/po/it.po24
-rw-r--r--doc/po/ja.po36
-rw-r--r--doc/po/pl.po56
-rw-r--r--doc/po/pt.po54
-rw-r--r--doc/po/pt_BR.po24
10 files changed, 208 insertions, 198 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 620d22106..ce68fcc63 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -70,16 +70,6 @@
available.</para></listitem>
</varlistentry>
- <varlistentry><term><option>dselect-upgrade</option></term>
- <listitem><para><literal>dselect-upgrade</literal>
- is used in conjunction with the traditional Debian packaging
- front-end, &dselect;. <literal>dselect-upgrade</literal>
- follows the changes made by &dselect; to the <literal>Status</literal>
- field of available packages, and performs the actions necessary to realize
- that state (for instance, the removal of old and the installation of new
- packages).</para></listitem>
- </varlistentry>
-
<varlistentry><term><option>dist-upgrade</option></term>
<listitem><para><literal>dist-upgrade</literal> in addition to performing the function of
<literal>upgrade</literal>, also intelligently handles changing dependencies
@@ -93,6 +83,16 @@
overriding the general settings for individual packages.</para></listitem>
</varlistentry>
+ <varlistentry><term><option>dselect-upgrade</option></term>
+ <listitem><para><literal>dselect-upgrade</literal>
+ is used in conjunction with the traditional Debian packaging
+ front-end, &dselect;. <literal>dselect-upgrade</literal>
+ follows the changes made by &dselect; to the <literal>Status</literal>
+ field of available packages, and performs the actions necessary to realize
+ that state (for instance, the removal of old and the installation of new
+ packages).</para></listitem>
+ </varlistentry>
+
<varlistentry><term><option>install</option></term>
<listitem>
<para><literal>install</literal> is followed by one or more
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 60a1a7fad..6501cc271 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.5.2~20120525\n"
+"Project-Id-Version: apt-doc 0.9.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-26 17:47+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2085,17 +2085,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, "
-"&dselect;. <literal>dselect-upgrade</literal> follows the changes made by "
-"&dselect; to the <literal>Status</literal> field of available packages, and "
-"performs the actions necessary to realize that state (for instance, the "
-"removal of old and the installation of new packages)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2108,6 +2097,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, "
+"&dselect;. <literal>dselect-upgrade</literal> follows the changes made by "
+"&dselect; to the <literal>Status</literal> field of available packages, and "
+"performs the actions necessary to realize that state (for instance, the "
+"removal of old and the installation of new packages)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/de.po b/doc/po/de.po
index 2b560fc82..5903b505c 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: 2012-05-21 23:18+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1718,10 +1718,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Hilfsprogramm zum Extrahieren der <command>debconf</command>-Konfiguration und Schablonen von "
-"Debian-Paketen"
+"Hilfsprogramm zum Extrahieren der <command>debconf</command>-Konfiguration "
+"und Schablonen von Debian-Paketen"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1762,13 +1764,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted <command>debconf</command> template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
-"temporäres Verzeichnis, in das die extrahierten <command>debconf</command>-Schablonendateien "
-"und Konfigurationsdateien geschrieben werden. Konfigurationselement: "
-"<literal>APT::ExtractTemplates::TempDir</literal>"
+"temporäres Verzeichnis, in das die extrahierten <command>debconf</command>-"
+"Schablonendateien und Konfigurationsdateien geschrieben werden. "
+"Konfigurationselement: <literal>APT::ExtractTemplates::TempDir</literal>"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2825,23 +2827,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> wird zusammen mit der traditionellen "
-"Debian-Oberfläche &dselect; benutzt. <literal>dselect-upgrade</literal> "
-"folgt den durch &dselect; am <literal>Status</literal>-Feld verfügbarer "
-"Pakete gemachten Änderungen und führt die notwendigen Aktionen durch, um "
-"diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
-"Installieren von neuen Paketen)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2864,6 +2849,23 @@ msgstr ""
"überschreiben der allgemeinen Einstellungen für einzelne Pakete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> wird zusammen mit der traditionellen "
+"Debian-Oberfläche &dselect; benutzt. <literal>dselect-upgrade</literal> "
+"folgt den durch &dselect; am <literal>Status</literal>-Feld verfügbarer "
+"Pakete gemachten Änderungen und führt die notwendigen Aktionen durch, um "
+"diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
+"Installieren von neuen Paketen)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/es.po b/doc/po/es.po
index 65977616b..9199849ee 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -37,7 +37,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: 2010-08-25 03:25+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1767,10 +1767,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Herramienta para extraer la configuración de <command>debconf</command> y las plantillas de los "
-"paquetes de Debian"
+"Herramienta para extraer la configuración de <command>debconf</command> y "
+"las plantillas de los paquetes de Debian"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1810,13 +1812,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted <command>debconf</command> template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
"El directorio temporal en el que se escribirán los ficheros de plantillas "
-"<command>debconf</command> y los scripts de configuración extraídos. Opción de configuración: "
-"<literal>APT::ExtractTemplates::TempDir</literal>"
+"<command>debconf</command> y los scripts de configuración extraídos. Opción "
+"de configuración: <literal>APT::ExtractTemplates::TempDir</literal>"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2871,23 +2873,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> se usa junto al tradicional administrador "
-"de paquetes de Debian, &dselect;. <literal>dselect-upgrade</literal> "
-"registra los cambios que haya hecho &dselect; al campo <literal>Status</"
-"literal> (estado) de los paquetes disponibles y realiza las acciones "
-"necesarias para que los cambios se lleven a cabo (por ejemplo, borrar "
-"paquetes antiguos e instalar las nuevas versiones)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2909,6 +2894,23 @@ msgstr ""
"comportamiento para paquetes individuales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> se usa junto al tradicional administrador "
+"de paquetes de Debian, &dselect;. <literal>dselect-upgrade</literal> "
+"registra los cambios que haya hecho &dselect; al campo <literal>Status</"
+"literal> (estado) de los paquetes disponibles y realiza las acciones "
+"necesarias para que los cambios se lleven a cabo (por ejemplo, borrar "
+"paquetes antiguos e instalar las nuevas versiones)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 04b0cbd87..f7208c8df 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: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: 2011-02-17 07:50+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1726,10 +1726,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Outil d'extraction des textes et fichiers de configuration pour <command>debconf</command> "
-"contenu dans un paquet Debian"
+"Outil d'extraction des textes et fichiers de configuration pour "
+"<command>debconf</command> contenu dans un paquet Debian"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1769,13 +1771,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted <command>debconf</command> template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
"Répertoire temporaire dans lequel écrire les scripts de configuration et "
-"modèles d'écrans pour <command>debconf</command>. Élément de configuration : <literal>APT::"
-"ExtractTemplates::TempDir</literal>."
+"modèles d'écrans pour <command>debconf</command>. Élément de configuration : "
+"<literal>APT::ExtractTemplates::TempDir</literal>."
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2832,24 +2834,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
-"&dselect;, la plus ancienne interface du projet Debian pour la gestion des "
-"paquets. La commande <literal>dselect-upgrade</literal> suit les "
-"modifications faites par &dselect; dans le champ <literal>Status</literal> "
-"des paquets disponibles, et effectue les actions nécessaires à la "
-"réalisation de cet état (par exemple, suppression d'anciens paquets, "
-"installation de nouveaux paquets)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2871,6 +2855,24 @@ msgstr ""
"un mécanisme de remplacement des paramètres généraux pour certains paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
+"&dselect;, la plus ancienne interface du projet Debian pour la gestion des "
+"paquets. La commande <literal>dselect-upgrade</literal> suit les "
+"modifications faites par &dselect; dans le champ <literal>Status</literal> "
+"des paquets disponibles, et effectue les actions nécessaires à la "
+"réalisation de cet état (par exemple, suppression d'anciens paquets, "
+"installation de nouveaux paquets)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/it.po b/doc/po/it.po
index e9435b595..addaffb02 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: 2012-05-26 17:47+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -2056,17 +2056,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2079,6 +2068,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 331c37395..eecdb97cd 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: 2012-05-26 17:47+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: 2010-09-07 07:38+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -2940,23 +2940,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント"
-"エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> "
-"は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー"
-"ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例"
-"えば、古いパッケージの削除や新しいパッケージのインストールなど)"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2979,6 +2962,23 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント"
+"エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> "
+"は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー"
+"ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例"
+"えば、古いパッケージの削除や新しいパッケージのインストールなど)"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 39988ebce..4c2857921 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,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: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: 2010-03-18 22:00+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -1820,7 +1820,9 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
"Narzędzie wyciągające z pakietów Debiana skrypty konfiguracyjne i szablony "
"<command>debconf</command>"
@@ -1869,13 +1871,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted <command>debconf</command> template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
msgstr ""
-"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony <command>debconf</command> i "
-"pliki konfiguracyjne. Pozycja w pliku konfiguracyjnym: <literal>APT::"
-"ExtractTemplates::TempDir</literal>."
+"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony "
+"<command>debconf</command> i pliki konfiguracyjne. Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::ExtractTemplates::TempDir</literal>."
#
#. type: Content of: <refentry><refsect1><para>
@@ -2735,25 +2737,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> jest używane w połączeniu z programem "
-"&dselect;, tradycyjnym narzędziem do zarządzania pakietami w systemie "
-"Debian. <literal>dselect-upgrade</literal> uwzględnia zmiany zrobione "
-"programem &dselect; w polu <literal>Status</literal> pliku zawierającego "
-"informacje o dostępnych pakietach i wykonuje akcje potrzebne do "
-"zrealizowania tych zmian (na przykład: usunięcie starych pakietów i dodanie "
-"nowych)."
-
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2777,6 +2760,25 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> jest używane w połączeniu z programem "
+"&dselect;, tradycyjnym narzędziem do zarządzania pakietami w systemie "
+"Debian. <literal>dselect-upgrade</literal> uwzględnia zmiany zrobione "
+"programem &dselect; w polu <literal>Status</literal> pliku zawierającego "
+"informacje o dostępnych pakietach i wykonuje akcje potrzebne do "
+"zrealizowania tych zmian (na przykład: usunięcie starych pakietów i dodanie "
+"nowych)."
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 7ba02e57c..899d683e7 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-25 13:12+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"
"PO-Revision-Date: 2010-08-25 23:07+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1723,10 +1723,12 @@ msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract <command>debconf</command> config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
msgstr ""
-"Utilitário para extrair configurações e modelos <command>debconf</command> a partir de pacotes "
-"Debian"
+"Utilitário para extrair configurações e modelos <command>debconf</command> a "
+"partir de pacotes Debian"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:39
@@ -1766,13 +1768,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:58
msgid ""
-"Temporary directory in which to write extracted <command>debconf</command> template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
-msgstr ""
-"Directório temporário para onde escrever ficheiros <command>debconf</command> modelo extraídos "
-"e scripts de configuração. Item de Configuração: <literal>APT::"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts. Configuration Item: <literal>APT::"
"ExtractTemplates::TempDir</literal>"
+msgstr ""
+"Directório temporário para onde escrever ficheiros <command>debconf</"
+"command> modelo extraídos e scripts de configuração. Item de Configuração: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
#. type: Content of: <refentry><refsect1><para>
#: apt-extracttemplates.1.xml:75
@@ -2828,22 +2830,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> é usado em conjunto com o front-end de "
-"pacotes Debian tradicional, &dselect;. <literal>dselect-upgrade</literal> "
-"segue as alterações feitas pelo &dselect; ao campo <literal>Status</literal> "
-"dos pacotes disponíveis, e executa as acções necessárias para realizar esse "
-"estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2866,6 +2852,22 @@ msgstr ""
"sobrepor as definições gerais em pacotes individuais."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> é usado em conjunto com o front-end de "
+"pacotes Debian tradicional, &dselect;. <literal>dselect-upgrade</literal> "
+"segue as alterações feitas pelo &dselect; ao campo <literal>Status</literal> "
+"dos pacotes disponíveis, e executa as acções necessárias para realizar esse "
+"estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index bcd276e97..dbb3a08b7 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: 2012-05-26 17:47+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+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"
@@ -2115,17 +2115,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
@@ -2138,6 +2127,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "