summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/po/apt-doc.pot13
-rw-r--r--doc/po/de.po4
-rw-r--r--doc/po/es.po4
-rw-r--r--doc/po/fr.po4
-rw-r--r--doc/po/it.po11
-rw-r--r--doc/po/ja.po4
-rw-r--r--doc/po/pl.po4
-rw-r--r--doc/po/pt.po4
-rw-r--r--doc/po/pt_BR.po11
10 files changed, 32 insertions, 29 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index ce68fcc63..48e8d4122 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -76,7 +76,7 @@
with new versions of packages; <command>apt-get</command> has a "smart" conflict
resolution system, and it will attempt to upgrade the most important
packages at the expense of less important ones if necessary.
- So, <literal>dist-upgrade</literal> command may remove some packages.
+ The <literal>dist-upgrade</literal> command may therefore remove some packages.
The <filename>/etc/apt/sources.list</filename> file contains a list of locations
from which to retrieve desired package files.
See also &apt-preferences; for a mechanism for
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 6501cc271..fc44b215d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-29 15:35+0300\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -2089,11 +2089,12 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also "
+"&apt-preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index 5903b505c..95e0a1ffe 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -2831,8 +2831,8 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
+"important packages at the expense of less important ones if necessary. The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "
"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
"from which to retrieve desired package files. See also &apt-preferences; "
"for a mechanism for overriding the general settings for individual packages."
diff --git a/doc/po/es.po b/doc/po/es.po
index 9199849ee..a9e219c28 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -2877,8 +2877,8 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
+"important packages at the expense of less important ones if necessary. The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "
"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
"from which to retrieve desired package files. See also &apt-preferences; "
"for a mechanism for overriding the general settings for individual packages."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index f7208c8df..5adb3459b 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -2838,8 +2838,8 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
+"important packages at the expense of less important ones if necessary. The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "
"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
"from which to retrieve desired package files. See also &apt-preferences; "
"for a mechanism for overriding the general settings for individual packages."
diff --git a/doc/po/it.po b/doc/po/it.po
index addaffb02..41e1314df 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -2060,11 +2060,12 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index eecdb97cd..60edbbad6 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -2944,8 +2944,8 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
+"important packages at the expense of less important ones if necessary. The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "
"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
"from which to retrieve desired package files. See also &apt-preferences; "
"for a mechanism for overriding the general settings for individual packages."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 4c2857921..922a85a97 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -2741,8 +2741,8 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
+"important packages at the expense of less important ones if necessary. The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "
"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
"from which to retrieve desired package files. See also &apt-preferences; "
"for a mechanism for overriding the general settings for individual packages."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 899d683e7..3867ad661 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2834,8 +2834,8 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
+"important packages at the expense of less important ones if necessary. The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "
"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
"from which to retrieve desired package files. See also &apt-preferences; "
"for a mechanism for overriding the general settings for individual packages."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index dbb3a08b7..10fd6b578 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -2119,11 +2119,12 @@ msgid ""
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
"with new versions of packages; <command>apt-get</command> has a \"smart\" "
"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary. So, "
-"<literal>dist-upgrade</literal> command may remove some packages. The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files. See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
+"important packages at the expense of less important ones if necessary. The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages. "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files. See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>