瀏覽代碼

Reword: "So, <literal>dist-upgrade</literal> command may remove some packages."
to "The <literal>dist-upgrade</literal> command may therefore remove some packages."

Justin B Rye 14 年之前
父節點
當前提交
6c1965bd8d
共有 10 個文件被更改,包括 32 次插入29 次删除
  1. 1 1
      doc/apt-get.8.xml
  2. 7 6
      doc/po/apt-doc.pot
  3. 2 2
      doc/po/de.po
  4. 2 2
      doc/po/es.po
  5. 2 2
      doc/po/fr.po
  6. 6 5
      doc/po/it.po
  7. 2 2
      doc/po/ja.po
  8. 2 2
      doc/po/pl.po
  9. 2 2
      doc/po/pt.po
  10. 6 5
      doc/po/pt_BR.po

+ 1 - 1
doc/apt-get.8.xml

@@ -76,7 +76,7 @@
      with new versions of packages; <command>apt-get</command> has a "smart" conflict 
      with new versions of packages; <command>apt-get</command> has a "smart" conflict 
      resolution system, and it will attempt to upgrade the most important 
      resolution system, and it will attempt to upgrade the most important 
      packages at the expense of less important ones if necessary. 
      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 
      The <filename>/etc/apt/sources.list</filename> file contains a list of locations 
      from which to retrieve desired package files.
      from which to retrieve desired package files.
      See also &apt-preferences; for a mechanism for
      See also &apt-preferences; for a mechanism for

+ 7 - 6
doc/po/apt-doc.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5.1\n"
 "Project-Id-Version: apt-doc 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2089,11 +2089,12 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 ""
 msgstr ""
 
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

+ 2 - 2
doc/po/de.po

@@ -2831,8 +2831,8 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 "
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "for a mechanism for overriding the general settings for individual packages."

+ 2 - 2
doc/po/es.po

@@ -2877,8 +2877,8 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 "
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "for a mechanism for overriding the general settings for individual packages."

+ 2 - 2
doc/po/fr.po

@@ -2838,8 +2838,8 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 "
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "for a mechanism for overriding the general settings for individual packages."

+ 6 - 5
doc/po/it.po

@@ -2060,11 +2060,12 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 ""
 msgstr ""
 
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

+ 2 - 2
doc/po/ja.po

@@ -2944,8 +2944,8 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 "
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "for a mechanism for overriding the general settings for individual packages."

+ 2 - 2
doc/po/pl.po

@@ -2741,8 +2741,8 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 "
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "for a mechanism for overriding the general settings for individual packages."

+ 2 - 2
doc/po/pt.po

@@ -2834,8 +2834,8 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 "
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "for a mechanism for overriding the general settings for individual packages."

+ 6 - 5
doc/po/pt_BR.po

@@ -2119,11 +2119,12 @@ msgid ""
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "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 ""
 msgstr ""
 
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>