* Simplified Chinese (Aron Xu). Closes: #594458

* Portuguese (Américo Monteiro)

diff --git a/debian/changelog b/debian/changelog
index 41ec1b2a15cebad8fd71ee564fa685a0694b1900..b4e0fd5dd0cbeba2b075d8bcede59ce2d4c22209 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,15 @@ apt (0.8.1) UNRELEASED; urgency=low
   * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
   * Italian (Milo Casagrande). Closes: #594238
   * Asturian (maacub). Closes: #594303
   * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
   * Italian (Milo Casagrande). Closes: #594238
   * Asturian (maacub). Closes: #594303

+  * Simplified Chinese (Aron Xu). Closes: #594458

 
   [ Christian Perrier ]
   * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
     Closes: #594211
 
 
   [ Christian Perrier ]
   * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
     Closes: #594211
 

+  [ Manpages translations ]
+  * Portuguese (Américo Monteiro)
+

   [ David Kalnischkies ]
   * show in madison command again also source packages (LP: #614589)
 
   [ David Kalnischkies ]
   * show in madison command again also source packages (LP: #614589)
 

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 1fb706d4180284e9feab0acd690ca877873c0a19..02971023e5619aceccad5c0dee2313ced399d06c 100644 (file)
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -1,13 +1,13 @@
 # Translation of apt manpages to Portuguese
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # Translation of apt manpages to Portuguese
 # Copyright (C) 2009 Free Software Foundation, Inc.

-# This file is distributed under the same license as the apt-doc package.
+# This file is distributed under the same license as the apt package.

 #
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010.
 msgid ""
 msgstr ""
 #
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010.
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 0.7.26~exp3\n"
-"POT-Creation-Date: 2010-07-30 12:46+0300\n"
-"PO-Revision-Date: 2010-03-19 00:21+0000\n"
+"Project-Id-Version: apt 0.8.0~pre1\n"
+"POT-Creation-Date: 2010-08-23 18:46-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"
 "Language: pt\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"


@@ -44,7 +44,7 @@ msgstr "NOME"
 #. type: Plain text
 #: apt.8:20
 msgid "apt - Advanced Package Tool"
 #. type: Plain text
 #: apt.8:20
 msgid "apt - Advanced Package Tool"

-msgstr "apt - Advanced Package Tool"
+msgstr "apt - Ferramenta de Pacotes Avançada"

 
 #. type: SH
 #: apt.8:20
 
 #. type: SH
 #: apt.8:20


@@ -793,17 +793,7 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent:264
 
 #. type: Plain text
 #: apt.ent:264

-#, fuzzy, no-wrap
-#| msgid ""
-#| "     <varlistentry>\n"
-#| "      <term><option>-c</option></term>\n"
-#| "      <term><option>--config-file</option></term>\n"
-#| "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
-#| "     The program will read the default configuration file and then this \n"
-#| "     configuration file. See &apt-conf; for syntax information.     \n"
-#| "     </para>\n"
-#| "     </listitem>\n"
-#| "     </varlistentry>\n"
+#, no-wrap

 msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"


@@ -820,9 +810,13 @@ msgstr ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"

-"     <listitem><para>Ficheiro de Configuração; Especifica um ficheiro de configuração a usar. \n"
+"     <listitem><para>Ficheiro de Configuração; Especifica o ficheiro de \n"
+"     configuração a usar. \n"

 "     O programa irá ler o ficheiro de configuração predefinido e depois este \n"
 "     O programa irá ler o ficheiro de configuração predefinido e depois este \n"

-"     ficheiro de configuração. Veja &apt-conf; para informação de sintaxe.     \n"
+"     ficheiro de configuração. Se as definições de configuração precisarem de \n"
+"     ser definidas antes, os ficheiros de configuração predefinidos são \n"
+"     analisados especificando um ficheiro com a variável de ambiente \n"
+"     <envar>APT_CONFIG</envar>. Veja &apt-conf; para informação de sintaxe.\n"

 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"


@@ -1087,13 +1081,7 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent:373
 
 #. type: Plain text
 #: apt.ent:373

-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY file-sourceslist \"\n"
-#| "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-#| "     <listitem><para>Locations to fetch packages from.\n"
-#| "     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
-#| "     </varlistentry>\n"
+#, no-wrap

 msgid ""
 "<!ENTITY file-extended_states \"\n"
 "      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
 msgid ""
 "<!ENTITY file-extended_states \"\n"
 "      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"


@@ -1103,11 +1091,13 @@ msgid ""
 "      </varlistentry>\n"
 "\">\n"
 msgstr ""
 "      </varlistentry>\n"
 "\">\n"
 msgstr ""

-"<!ENTITY file-sourceslist \"\n"
-"     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-"     <listitem><para>Localizações de onde obter pacotes.\n"
-"     Item de Configuração: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
-"     </varlistentry>\n"
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Lista de estado de pacotes auto-instalados.\n"
+"      Item de Configuração: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"

 
 #. type: Plain text
 #: apt.ent:377
 
 #. type: Plain text
 #: apt.ent:377


@@ -1163,6 +1153,8 @@ msgid ""
 "<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
 "ENTITY testing-codename \"squeeze\">"
 msgstr ""
 "<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
 "ENTITY testing-codename \"squeeze\">"
 msgstr ""

+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"

 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>


@@ -1878,67 +1870,46 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:312
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:312

-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"

 msgid "<option>--no-pre-depends</option>"
 msgid "<option>--no-pre-depends</option>"

-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-pre-depends</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:313
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:313

-#, fuzzy
-#| msgid "<option>--no-download</option>"

 msgid "<option>--no-depends</option>"
 msgid "<option>--no-depends</option>"

-msgstr "<option>--no-download</option>"
+msgstr "<option>--no-depends</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:314
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:314

-#, fuzzy
-#| msgid "<option>--install-recommends</option>"

 msgid "<option>--no-recommends</option>"
 msgid "<option>--no-recommends</option>"

-msgstr "<option>--install-recommends</option>"
+msgstr "<option>--no-recommends</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:315
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:315

-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"

 msgid "<option>--no-suggests</option>"
 msgid "<option>--no-suggests</option>"

-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-suggests</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:316
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:316

-#, fuzzy
-#| msgid "<option>--no-mount</option>"

 msgid "<option>--no-conflicts</option>"
 msgid "<option>--no-conflicts</option>"

-msgstr "<option>--no-mount</option>"
+msgstr "<option>--no-conflicts</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:317
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:317

-#, fuzzy
-#| msgid "<option>--no-act</option>"

 msgid "<option>--no-breaks</option>"
 msgid "<option>--no-breaks</option>"

-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-breaks</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:318
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:318

-#, fuzzy
-#| msgid "<option>--no-act</option>"

 msgid "<option>--no-replaces</option>"
 msgid "<option>--no-replaces</option>"

-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-replaces</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:319
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:319

-#, fuzzy
-#| msgid "<option>--no-act</option>"

 msgid "<option>--no-enhances</option>"
 msgid "<option>--no-enhances</option>"

-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-enhances</option>"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:320
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:320

-#, fuzzy
-#| msgid ""
-#| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
-#| "so that all packages mentioned are printed once.  Configuration Item: "
-#| "<literal>APT::Cache::RecurseDepends</literal>."

 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be twicked with these flags which will omit "
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be twicked with these flags which will omit "


@@ -1946,9 +1917,11 @@ msgid ""
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
 "Cache::ShowRecommends</literal>."
 msgstr ""
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
 "Cache::ShowRecommends</literal>."
 msgstr ""

-"Torna <literal>depends</literal> e <literal>rdepends</literal> recursivo "
-"para que todos os pacotes mencionados sejam escritos uma vez. Item de "
-"Configuração <literal>APT::Cache::RecurseDepends</literal>."
+"Por predefinição o <literal>depends</literal> e <literal>rdepends</literal> "
+"escrevem todas as dependências. Isto pode ser afinado com estas bandeiras "
+"que irão omitir o tipo de dependência especificado. Item de Configuração: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"ex. <literal>APT::Cache::ShowRecommends</literal>."

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319


@@ -2811,16 +2784,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:119
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:119

-#, fuzzy
-#| msgid ""
-#| "Values for the additional metadata fields in the Release file are taken "
-#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
-#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
-#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
-#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
-#| "<literal>Codename</literal>, <literal>Date</literal>, "
-#| "<literal>Architectures</literal>, <literal>Components</literal>, "
-#| "<literal>Description</literal>."

 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"


@@ -3065,23 +3028,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:229
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:229

-#, fuzzy
-#| msgid "Contents::Compress"

 msgid "Translation::Compress"
 msgid "Translation::Compress"

-msgstr "Contents::Compress"
+msgstr "Translation::Compress"

 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:231
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:231

-#, fuzzy
-#| msgid ""
-#| "This is similar to <literal>Packages::Compress</literal> except that it "
-#| "controls the compression for the Contents files."

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "

-"controla a compressão para os ficheiros de Conteúdos."
+"controla a compressão para o ficheiro mestre Translation-en."

 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:235
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:235


@@ -3116,10 +3073,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395

-#, fuzzy
-#| msgid "Description"

 msgid "LongDescription"
 msgid "LongDescription"

-msgstr "Descrição"
+msgstr "LongDescription"

 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397


@@ -3127,6 +3082,8 @@ msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""

+"Define se as descrições longas devem ser incluídas no ficheiro Packages ou "
+"divididas em um ficheiro Translation-en mestre."

 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:257
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:257


@@ -3241,10 +3198,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:306
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:306

-#, fuzzy
-#| msgid "Operation"

 msgid "Translation"
 msgid "Translation"

-msgstr "Operação"
+msgstr "Translation"

 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:308
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:308


@@ -3253,6 +3208,9 @@ msgid ""
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""

+"Define se o ficheiro mestre Translation-en de saída com as descrições longas "
+"não deve ser incluído no ficheiro Packages. A predefinição é <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"

 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:313
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:313


@@ -3370,12 +3328,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:364
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:364

-#, fuzzy
-#| msgid ""
-#| "The <literal>Tree</literal> section takes a scope tag which sets the "
-#| "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
-#| "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-#| "setting such as <filename>dists/woody</filename>."

 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "


@@ -3385,7 +3337,7 @@ msgstr ""
 "A secção <literal>Tree</literal> recebe uma etiqueta scope que define a "
 "variável <literal>$(DIST)</literal> e define a raiz da árvore (o caminho é "
 "prefixado por <literal>ArchiveDir</literal>). Tipicamente esta é uma "
 "A secção <literal>Tree</literal> recebe uma etiqueta scope que define a "
 "variável <literal>$(DIST)</literal> e define a raiz da árvore (o caminho é "
 "prefixado por <literal>ArchiveDir</literal>). Tipicamente esta é uma "

-"definição tal como <filename>dists/woody</filename>."
+"definição tal como <filename>dists/&stable-codename;</filename>."

 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:369
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:369


@@ -3826,13 +3778,6 @@ msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:595
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:595

-#, fuzzy
-#| msgid ""
-#| "This configuration option defaults to \"<literal>true</literal>\" and "
-#| "should only be set to <literal>\"false\"</literal> if the Archive "
-#| "generated with &apt-ftparchive; also provides <filename>Translation</"
-#| "filename> files. Note that it is currently not possible to create these "
-#| "files with <command>apt-ftparchive</command>."

 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "


@@ -3843,8 +3788,8 @@ msgstr ""
 "Esta opção de configuração tem a predefinição de \"<literal>true</literal>\" "
 "e deve apenas ser definida para <literal>\"false\"</literal> se o Arquivo "
 "gerado com &apt-ftparchive; também disponibilizar ficheiros "
 "Esta opção de configuração tem a predefinição de \"<literal>true</literal>\" "
 "e deve apenas ser definida para <literal>\"false\"</literal> se o Arquivo "
 "gerado com &apt-ftparchive; também disponibilizar ficheiros "

-"<filename>Translation</filename>. Note que actualmente não é possível criar "
-"esses ficheiros com <command>apt-ftparchive</command>."
+"<filename>Translation</filename>. Note que o ficheiro mestre "
+"<filename>Translation-en</filename> só pode ser criado no comando generate."

 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491


@@ -3900,41 +3845,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-get.8.xml:36
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-get.8.xml:36

-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
-#| "choice='plain'> <replaceable>target_release_number_expression</"
-#| "replaceable> </arg> <arg choice='plain'> "
-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"

 msgid ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
 msgid ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "


@@ -3966,30 +3876,22 @@ msgstr ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
 "arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </"
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
 "arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </"

-"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-"choice='plain'> <replaceable>nome_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> "
-"<replaceable>expressão_de_número_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> "
-"<replaceable>nome_de_código_do_lançamento_de_destino</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>número_de_versão_do_pacote</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>nome_do_lançamento_de_destino</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nome_de_código_do_lançamento_de_destino</"
-"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></"
-"arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
+"<replaceable>lançamento_de_destino</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+"choice='plain'> =<replaceable>número_de_versão_do_pacote</replaceable> </"
+"arg> <arg choice='plain'> /<replaceable>lançamento_de_destino</replaceable> "
+"</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
+"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"

 "\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source "
 "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> "
 "<group choice='req'> <arg choice='plain'> "
 "=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "
 "\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source "
 "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> "
 "<group choice='req'> <arg choice='plain'> "
 "=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "

-"choice='plain'> /<replaceable>nome_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> /"
-"<replaceable>nome_de_código_de_lançamento_de_destino</replaceable> </arg> </"
+"choice='plain'> /<replaceable>lançamento_de_destino</replaceable> </arg> </"

 "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
 "\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg "
 "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
 "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
 "\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg "
 "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "


@@ -4001,12 +3903,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:112
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:112

-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library.  Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic;, &gnome-apt; and &wajig;."

 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "


@@ -4016,8 +3912,7 @@ msgstr ""
 "<command>apt-get</command> é a ferramenta de linha de comandos para lidar "
 "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para "
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
 "<command>apt-get</command> é a ferramenta de linha de comandos para lidar "
 "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para "
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "

-"\"front-end\" como o &dselect;, &aptitude;, &synaptic;, &gnome-apt; e "
-"&wajig;."
+"\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:121 apt-key.8.xml:124
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:121 apt-key.8.xml:124


@@ -5467,7 +5362,7 @@ msgstr "Mostra a versão do programa."
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
 msgid "  &file-extended_states;"
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
 msgid "  &file-extended_states;"

-msgstr ""
+msgstr "  &file-extended_states;"

 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:129
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:129


@@ -6192,12 +6087,6 @@ msgstr "Default-Release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:153
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:153

-#, fuzzy
-#| msgid ""
-#| "Default release to install packages from if more than one version "
-#| "available. Contains release name, codename or release version. Examples: "
-#| "'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See "
-#| "also &apt-preferences;."

 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "
 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "


@@ -6206,8 +6095,8 @@ msgid ""
 msgstr ""
 "Lançamento predefinido de onde instalar pacotes se existir mais de uma "
 "versão disponível. Contém o nome do lançamento, nome de código ou versão de "
 msgstr ""
 "Lançamento predefinido de onde instalar pacotes se existir mais de uma "
 "versão disponível. Contém o nome do lançamento, nome de código ou versão de "

-"lançamento. Exemplos: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', "
-"'4.0', '5.0*'. Veja também &apt-preferences;."
+"lançamento. Exemplos: 'stable', 'testing', 'unstable', '&stable-codename;', "
+"'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:158
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:158


@@ -6336,7 +6225,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:202
 msgid "Cache-Start, Cache-Grow and Cache-Limit"
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:202
 msgid "Cache-Start, Cache-Grow and Cache-Limit"

-msgstr ""
+msgstr "Cache-Start, Cache-Grow e Cache-Limit"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:203
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:203


@@ -6357,6 +6246,23 @@ msgid ""
 "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
 "is set to 0 the automatic grow of the cache is disabled."
 msgstr ""
 "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
 "is set to 0 the automatic grow of the cache is disabled."
 msgstr ""

+"O APT usa desde a versão 0.7.26 um ficheiro de cache com mapa de memória de "
+"tamanho ajustável para armazenar a informação disponível. <literal>Cache-"
+"Start</literal> actua como uma dica para que tamanho a Cache irá crescer e é "
+"por isso a quantidade de memória que o APT irá requerer no arranque. O valor "
+"predefinido é 20971520 bytes (~20 MB). Note que esta quantidade de espaço "
+"precisa estar disponível para o APT caso contrário ele irá con certeza "
+"falhar, portanto para dispositivos com pouca memória este valor deve ser "
+"diminuído enquanto que em sistemas com muitas fontes configuradas este pode "
+"ser aumentado. <literal>Cache-Grow</literal> define em bytes com a "
+"predefinição de 1048576 (~1 MB) quanto o tamanho da Cache será aumentado no "
+"caso do espaço definido por <literal>Cache-Start</literal> não ser "
+"suficiente. Este valor será aplicado várias vezes até que a cache seja "
+"suficientemente grande para armazenar toda a informação ou que o tamanho da "
+"cache alcance o <literal>Cache-Limit</literal>. O valor predefinido de "
+"<literal>Cache-Limit</literal> é 0 o que significa nenhum limite. Se "
+"<literal>Cache-Grow</literal> for definido para 0, o crescimento automático "
+"da cache é desactivado."

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:218
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:218


@@ -6420,7 +6326,7 @@ msgstr "O Grupo Acquire"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:244
 msgid "Check-Valid-Until"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:244
 msgid "Check-Valid-Until"

-msgstr ""
+msgstr "Check-Valid-Until"

 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:245
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:245


@@ -6433,11 +6339,20 @@ msgid ""
 "header, but if they don't or a stricter value is volitional the following "
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 "header, but if they don't or a stricter value is volitional the following "
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""

+"Opção relacionada com segurança com predefinição a 'verdadeiro' como uma "
+"validação expirada para um ficheiro Release previne ataques repetidos "
+"durante longo tempo e pode, por exemplo, ajudar os utilizadores a "
+"identificar mirrors que não são actualizados à muito tempo - mas a "
+"funcionalidade depende da precisão de hora no sistema do utilizador. Os "
+"responsáveis do arquivo são encorajados a criar ficheiros Release com o "
+"cabeçalho <literal>Valid-Until</literal>, mas se não o fizerem ou se "
+"preferir-se um valor mais rigoroso pode-se usar a opção <literal>Max-"
+"ValidTime</literal> seguinte."

 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:255
 msgid "Max-ValidTime"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:255
 msgid "Max-ValidTime"

-msgstr ""
+msgstr "Max-ValidTime"

 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:256
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:256


@@ -6452,6 +6367,15 @@ msgid ""
 "settings can be made by appending the label of the archive to the option "
 "name."
 msgstr ""
 "settings can be made by appending the label of the archive to the option "
 "name."
 msgstr ""

+"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
+"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
+"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
+"data é a predefinida. A data do ficheiro Release ou a data especificada pela "
+"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
+"mais os segundos especificados com esta opção são usados para verificar se a "
+"validação de um ficheiro já expirou ao usar uma data anterior às duas. "
+"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
+"do arquivo ao nome da opção. "

 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:268
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:268


@@ -6949,7 +6873,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:450
 msgid "GzipIndexes"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:450
 msgid "GzipIndexes"

-msgstr ""
+msgstr "GzipIndexes"

 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:452
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:452


@@ -6959,6 +6883,10 @@ msgid ""
 "unpacking them. This saves quite a lot of disk space at the expense of more "
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 "unpacking them. This saves quite a lot of disk space at the expense of more "
 "CPU requirements when building the local package caches. False by default."
 msgstr ""

+"Quando descarrega índices comprimidos em <literal>gzip</literal> (Pacotes, "
+"Fontes ou Traduções), mantêm-os localmente comprimidos em gzip em vez de os "
+"desempacotar. Isto poupa imenso espaço no disco à custa de mais pedidos à "
+"CPU quando constrói as caches de pacotes locais. Falso por predefinição."

 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:459
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:459


@@ -7162,6 +7090,13 @@ msgid ""
 "z]+</literal> is silently ignored. As seen in the last default value these "
 "patterns can use regular expression syntax."
 msgstr ""
 "z]+</literal> is silently ignored. As seen in the last default value these "
 "patterns can use regular expression syntax."
 msgstr ""

+"A lista <literal>Ignore-Files-Silently</literal> pode ser usada para "
+"especificar quais os ficheiros que o APT deve ignorar em silêncio enquanto "
+"analisa os ficheiros nos directórios de fragmento. Por predefinição que "
+"termine com <literal>.disabled</literal>, <literal>~</literal>, <literal>."
+"bak</literal> ou <literal>.dpkg-[a-z]+</literal> é ignorado em silêncio. "
+"Como visto no último valor predefinido, estes padrões podem usar sintaxe de "
+"expressão regular."

 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:541
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:541


@@ -8244,10 +8179,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101

-#, fuzzy
-#| msgid "priority 100"

 msgid "priority 1"
 msgid "priority 1"

-msgstr "priority 100"
+msgstr "priority 1"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102


@@ -8256,6 +8189,9 @@ msgid ""
 "filename> files are marked as \"NotAutomatic: yes\" like the debian "
 "experimental archive."
 msgstr ""
 "filename> files are marked as \"NotAutomatic: yes\" like the debian "
 "experimental archive."
 msgstr ""

+"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
+"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
+"experimental da debian."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:107
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:107


@@ -8306,11 +8242,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:123
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:123

-#, fuzzy
-#| msgid ""
-#| "If the target release has not been specified then APT simply assigns "
-#| "priority 100 to all installed package versions and priority 500 to all "
-#| "uninstalled package versions."

 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "


@@ -8318,9 +8249,11 @@ msgid ""
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
 "- these versions get the priority 1."
 msgstr ""
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
 "- these versions get the priority 1."
 msgstr ""

-"Se o lançamento destinado não foi especificado, então o APT simplesmente "
+"Se o lançamento de destino não foi especificado, então o APT simplesmente "

 "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "
 "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "

-"500 e todas as versões de pacotes não instalados."
+"500 e todas as versões de pacotes não instalados, à excepção de versões que "
+"venham de arquivos cujos ficheiros <filename>Release</filename> estejam "
+"marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1."

 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:129
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:129


@@ -8513,32 +8446,25 @@ msgid ""
 "high priority to all versions available from the server identified by the "
 "hostname \"ftp.de.debian.org\""
 msgstr ""
 "high priority to all versions available from the server identified by the "
 "hostname \"ftp.de.debian.org\""
 msgstr ""

+"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
+"\" que pode ser usada para corresponder a um nome de máquina. O seguinte "
+"registo irá atribuir uma alta prioridade a todas as versões disponíveis do "
+"servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:210
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:210

-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: origin \"\"\n"
-#| "Pin-Priority: 999\n"
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 msgstr ""
 "Package: *\n"
 msgid ""
 "Package: *\n"
 "Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 msgstr ""
 "Package: *\n"

-"Pin: origin \"\"\n"
+"Pin: origin \"ftp.de.debian.org\"\n"

 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:214
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:214

-#, fuzzy
-#| msgid ""
-#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
-#| "\".  This should not be confused with the Origin of a distribution as "
-#| "specified in a <filename>Release</filename> file.  What follows the "
-#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
-#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."

 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "


@@ -8546,12 +8472,11 @@ msgid ""
 "Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
 "\"."
 msgstr ""
 "Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
 "\"."
 msgstr ""

-"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
-"\". Isto não deve ser confundido com a Origem de uma distribuição como "
-"especificada num ficheiro <filename>Release</filename>. O que representa a "
-"etiqueta \"Origin:\" num ficheiro <filename>Release</filename> não é um "
-"endereço de Internet mas um nome de autor ou marca, tal como \"Debian\" ou "
-"\"Ximian\"."
+"Isto <emphasis>não</emphasis> deve ser confundido com a Origem de uma "
+"distribuição como especificada num ficheiro <filename>Release</filename>. O "
+"que representa a etiqueta \"Origin:\" num ficheiro <filename>Release</"
+"filename> não é um endereço de Internet mas um nome de autor ou marca, tal "
+"como \"Debian\" ou \"Ximian\"."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:219
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:219


@@ -8578,11 +8503,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:228
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:228

-#, fuzzy
-#| msgid ""
-#| "The following record assigns a high priority to all package versions "
-#| "belonging to any distribution whose Codename is \"<literal>squeeze</"
-#| "literal>\"."

 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"


@@ -8590,22 +8510,18 @@ msgid ""
 msgstr ""
 "O seguinte registo atribui uma alta prioridade a todas as versões de pacotes "
 "pertencentes a qualquer distribuição cujo nome de código é "
 msgstr ""
 "O seguinte registo atribui uma alta prioridade a todas as versões de pacotes "
 "pertencentes a qualquer distribuição cujo nome de código é "

-"\"<literal>squeeze</literal>\"."
+"\"<literal>&testing-codename;</literal>\"."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:232
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:232

-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
 msgid ""
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"

-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"

 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>


@@ -8917,14 +8833,6 @@ msgstr "a linha <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:392
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:392

-#, fuzzy
-#| msgid ""
-#| "names the codename to which all the packages in the directory tree "
-#| "belong.  For example, the line \"Codename: squeeze\" specifies that all "
-#| "of the packages in the directory tree below the parent of the "
-#| "<filename>Release</filename> file belong to a version named "
-#| "<literal>squeeze</literal>.  Specifying this value in the APT preferences "
-#| "file would require the line:"

 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "


@@ -8934,18 +8842,17 @@ msgid ""
 "preferences file would require the line:"
 msgstr ""
 "nomeia o nome de código a qual todos os pacotes na árvore de directórios "
 "preferences file would require the line:"
 msgstr ""
 "nomeia o nome de código a qual todos os pacotes na árvore de directórios "

-"pertencem. Por exemplo, a linha \"Codename: squeeze\" especifica que todos "
-"os pacotes na árvore de directórios abaixo do pai do ficheiro "
+"pertencem. Por exemplo, a linha \"Codename: &testing-codename;\" especifica "
+"que todos os pacotes na árvore de directórios abaixo do pai do ficheiro "

 "<filename>Release</filename> pertencem a uma versão chamada "
 "<filename>Release</filename> pertencem a uma versão chamada "

-"<literal>squeeze</literal>. Especificar este valor no ficheiro de "
+"<literal>&testing-codename;</literal>. Especificar este valor no ficheiro de "

 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml:401
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml:401

-#, fuzzy, no-wrap
-#| msgid "Pin: release a=stable\n"
+#, no-wrap

 msgid "Pin: release n=&testing-codename;\n"
 msgid "Pin: release n=&testing-codename;\n"

-msgstr "Pin: release a=stable\n"
+msgstr "Pin: release n=&testing-codename;\n"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:408
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:408


@@ -9054,17 +8961,6 @@ msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:363
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:363

-#, fuzzy
-#| msgid ""
-#| "The <filename>Release</filename> file is normally found in the directory "
-#| "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-#| "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-#| "dists/woody/Release</filename>.  It consists of a single multi-line "
-#| "record which applies to <emphasis>all</emphasis> of the packages in the "
-#| "directory tree below its parent.  Unlike the <filename>Packages</"
-#| "filename> file, nearly all of the lines in a <filename>Release</filename> "
-#| "file are relevant for setting APT priorities: <placeholder type="
-#| "\"variablelist\" id=\"0\"/>"

 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "


@@ -9079,9 +8975,9 @@ msgstr ""
 "O ficheiro <filename>Release</filename> fica normalmente no directório "
 "<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
 "filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou "
 "O ficheiro <filename>Release</filename> fica normalmente no directório "
 "<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
 "filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou "

-"<filename>.../dists/woody/Release</filename>. Consiste num único registo de "
-"várias linhas que se aplica a <emphasis>todos</emphasis> os pacotes na "
-"árvore de directórios sob o seu pai. Ao contrário do ficheiro "
+"<filename>.../dists/&stable-codename;/Release</filename>. Consiste num único "
+"registo de várias linhas que se aplica a <emphasis>todos</emphasis> os "
+"pacotes na árvore de directórios sob o seu pai. Ao contrário do ficheiro "

 "<filename>Packages</filename>, quase todas as linhas num ficheiro "
 "<filename>Release</filename> são relevantes para definir as prioridades do "
 "APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 "<filename>Packages</filename>, quase todas as linhas num ficheiro "
 "<filename>Release</filename> são relevantes para definir as prioridades do "
 "APT: <placeholder type=\"variablelist\" id=\"0\"/>"


@@ -9312,22 +9208,7 @@ msgstr "Acompanhando a evolução de um nome de código de lançamento"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:600
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:600

-#, fuzzy, no-wrap
-#| msgid ""
-#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
-#| "\n"
-#| "Explanation: Debian unstable is always codenamed with sid\n"
-#| "Package: *\n"
-#| "Pin: release a=sid\n"
-#| "Pin-Priority: 800\n"
-#| "\n"
-#| "Package: *\n"
-#| "Pin: release o=Debian\n"
-#| "Pin-Priority: -10\n"
+#, no-wrap

 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 "Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 "Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"


@@ -9345,9 +9226,9 @@ msgid ""
 "Pin-Priority: -10\n"
 msgstr ""
 "Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n"
 "Pin-Priority: -10\n"
 msgstr ""
 "Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n"

-"Explicação: para além daquelas da distribuição com nome de código squeeze ou sid\n"
+"Explicação: para além daquelas da distribuição com nome de código &testing-codename; ou sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explicação: Debian unstable tem sempre o nome de código sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explicação: Debian unstable tem sempre o nome de código sid\n"


@@ -9387,12 +9268,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:617
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:617

-#, fuzzy
-#| msgid ""
-#| "With a suitable &sources-list; file and the above preferences file, any "
-#| "of the following commands will cause APT to upgrade to the latest version"
-#| "(s) in the release codenamed with <literal>squeeze</literal>.  "
-#| "<placeholder type=\"programlisting\" id=\"0\"/>"

 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "


@@ -9401,8 +9276,8 @@ msgid ""
 msgstr ""
 "Com um ficheiro &sources-list; apropriado e o ficheiro de preferências "
 "acima, qualquer dos seguintes comandos fará com que o APT actualize para a "
 msgstr ""
 "Com um ficheiro &sources-list; apropriado e o ficheiro de preferências "
 "acima, qualquer dos seguintes comandos fará com que o APT actualize para a "

-"versão mais recente no lançamento com nome de código <literal>squeeze</"
-"literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
+"versão mais recente no lançamento com nome de código <literal>&testing-"
+"codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:637
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:637


@@ -9412,15 +9287,6 @@ msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:628
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:628

-#, fuzzy
-#| msgid ""
-#| "The following command will cause APT to upgrade the specified package to "
-#| "the latest version from the <literal>sid</literal> distribution.  "
-#| "Thereafter, <command>apt-get upgrade</command> will upgrade the package "
-#| "to the most recent <literal>squeeze</literal> version if that is more "
-#| "recent than the installed version, otherwise, to the most recent "
-#| "<literal>sid</literal> version if that is more recent than the installed "
-#| "version.  <placeholder type=\"programlisting\" id=\"0\"/>"

 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "


@@ -9431,10 +9297,10 @@ msgid ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "O seguinte comando irá fazer com que o APT actualize o pacote especificado "
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "O seguinte comando irá fazer com que o APT actualize o pacote especificado "

-"para a versão mais recente da distribuição <literal>sid</literal> "
-"distribution. Posteriormente, <command>apt-get upgrade</command> irá "
-"actualizar o pacote para a versão <literal>squeeze</literal> mais recente se "
-"essa for mais recente que a versão instalada, caso contrário, para a versão "
+"para a versão mais recente da distribuição <literal>sid</literal>. "
+"Posteriormente, <command>apt-get upgrade</command> irá actualizar o pacote "
+"para a versão <literal>&testing-codename;</literal> mais recente se essa for "
+"mais recente que a versão instalada, caso contrário, para a versão "

 "<literal>sid</literal> mais recente se essa for mais recente que a versão "
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 "<literal>sid</literal> mais recente se essa for mais recente que a versão "
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 


@@ -9644,18 +9510,14 @@ msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114

-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
-#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
-#| "   "
+#, no-wrap

 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
 "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 msgstr ""
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
 "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 msgstr ""

-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"

 "   "
 
 #. type: Content of: <refentry><refsect1><title>
 "   "
 
 #. type: Content of: <refentry><refsect1><title>


@@ -9858,23 +9720,18 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:208
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:208

-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the stable/contrib area."

 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""

-"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório Debian, e "
-"usa apenas a área stable/contrib."
+"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório debian, e "
+"usa apenas a área &stable-codename;/contrib."

 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210

-#, fuzzy, no-wrap
-#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, no-wrap

 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"

-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"

 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:212
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:212

diff --git a/po/it.po b/po/it.po
index c7f566cd59e423bcad8007024350fd5aee09043d..818e0aaef3b58ad7d10761f9677968f7f15c4856 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"

-"PO-Revision-Date: 2010-08-24 20:43+0200\n"
+"PO-Revision-Date: 2010-08-25 19:25+0200\n"

 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"


@@ -763,12 +763,12 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non completamente installati o rimossi.\n"
 
 #: cmdline/apt-get.cc:634
 msgstr "%lu non completamente installati o rimossi.\n"
 
 #: cmdline/apt-get.cc:634

-#, fuzzy, c-format
+#, c-format

 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n"
 
 #: cmdline/apt-get.cc:640
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n"
 
 #: cmdline/apt-get.cc:640

-#, fuzzy, c-format
+#, c-format

 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per l'espressione regolare \"%s\"\n"
 
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per l'espressione regolare \"%s\"\n"
 


@@ -810,17 +810,17 @@ msgid "However the following packages replace it:"
 msgstr "Tuttavia questi pacchetti lo sostituiscono:"
 
 #: cmdline/apt-get.cc:712
 msgstr "Tuttavia questi pacchetti lo sostituiscono:"
 
 #: cmdline/apt-get.cc:712

-#, fuzzy, c-format
+#, c-format

 msgid "Package '%s' has no installation candidate"
 msgid "Package '%s' has no installation candidate"

-msgstr "Il pacchetto %s non ha candidati da installare"
+msgstr "Il pacchetto \"%s\" non ha candidati da installare"

 
 #: cmdline/apt-get.cc:723
 
 #: cmdline/apt-get.cc:723

-#, fuzzy, c-format
+#, c-format

 msgid "Virtual packages like '%s' can't be removed\n"
 msgid "Virtual packages like '%s' can't be removed\n"

-msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi"
+msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi\n"

 
 #: cmdline/apt-get.cc:754
 
 #: cmdline/apt-get.cc:754

-#, fuzzy, c-format
+#, c-format

 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n"
 
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n"
 


@@ -2243,7 +2243,6 @@ msgstr ""
 
 # (ndt) lunghetta...
 #: apt-pkg/contrib/mmap.cc:402
 
 # (ndt) lunghetta...
 #: apt-pkg/contrib/mmap.cc:402

-#, fuzzy

 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""


@@ -2464,7 +2463,7 @@ msgid "Could not open file %s"
 msgstr "Impossibile aprire il file %s"
 
 #: apt-pkg/contrib/fileutl.cc:714
 msgstr "Impossibile aprire il file %s"
 
 #: apt-pkg/contrib/fileutl.cc:714

-#, fuzzy, c-format
+#, c-format

 msgid "Could not open file descriptor %d"
 msgstr "Impossibile aprire il descrittore del file %d"
 
 msgid "Could not open file descriptor %d"
 msgstr "Impossibile aprire il descrittore del file %d"
 


@@ -2479,22 +2478,22 @@ msgid "write, still have %lu to write but couldn't"
 msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
 
 #: apt-pkg/contrib/fileutl.cc:906
 msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
 
 #: apt-pkg/contrib/fileutl.cc:906

-#, fuzzy, c-format
+#, c-format

 msgid "Problem closing the gzip file %s"
 msgstr "Si è verificato un problema nel chiudere il file gzip %s"
 
 #: apt-pkg/contrib/fileutl.cc:909
 msgid "Problem closing the gzip file %s"
 msgstr "Si è verificato un problema nel chiudere il file gzip %s"
 
 #: apt-pkg/contrib/fileutl.cc:909

-#, fuzzy, c-format
+#, c-format

 msgid "Problem closing the file %s"
 msgstr "Si è verificato un problema nel chiudere il file %s"
 
 #: apt-pkg/contrib/fileutl.cc:914
 msgid "Problem closing the file %s"
 msgstr "Si è verificato un problema nel chiudere il file %s"
 
 #: apt-pkg/contrib/fileutl.cc:914

-#, fuzzy, c-format
+#, c-format

 msgid "Problem renaming the file %s to %s"
 msgstr "Si è verificato un problema nel rinominare il file %s in %s"
 
 #: apt-pkg/contrib/fileutl.cc:925
 msgid "Problem renaming the file %s to %s"
 msgstr "Si è verificato un problema nel rinominare il file %s in %s"
 
 #: apt-pkg/contrib/fileutl.cc:925

-#, fuzzy, c-format
+#, c-format

 msgid "Problem unlinking the file %s"
 msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
 
 msgid "Problem unlinking the file %s"
 msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
 


@@ -2887,7 +2886,7 @@ msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324

-#, fuzzy, c-format
+#, c-format

 msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)"
 
 msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)"
 


@@ -3196,12 +3195,12 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" per \"%s\" non trovato"
 
 #: apt-pkg/cacheset.cc:447
 msgstr "Version \"%s\" per \"%s\" non trovato"
 
 #: apt-pkg/cacheset.cc:447

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't find task '%s'"
 msgstr "Impossibile trovare il task \"%s\""
 
 #: apt-pkg/cacheset.cc:454
 msgid "Couldn't find task '%s'"
 msgstr "Impossibile trovare il task \"%s\""
 
 #: apt-pkg/cacheset.cc:454

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1545d1a145d1b3b4922d18ba55208d6d43d86530..a87c906963fdcd1e5625414aa76d45a50b89db49 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,20 +3,21 @@
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.

-# Aron Xu <happyaron.xu@gmail.com>, 2009.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.

 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 0.8.0~pre1\n"

 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"

-"PO-Revision-Date: 2009-12-02 01:00+0800\n"
+"PO-Revision-Date: 2010-08-26 14:42+0800\n"

 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"

-"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"

 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

+"Plural-Forms: nplurals=1; plural=0;\n"

 
 #: cmdline/apt-cache.cc:156
 #, c-format
 
 #: cmdline/apt-cache.cc:156
 #, c-format


@@ -28,9 +29,8 @@ msgid "Total package names: "
 msgstr "软件包名称总数："
 
 #: cmdline/apt-cache.cc:286
 msgstr "软件包名称总数："
 
 #: cmdline/apt-cache.cc:286

-#, fuzzy

 msgid "Total package structures: "
 msgid "Total package structures: "

-msgstr "软件包名称总数："
+msgstr "全部软件包结构："

 
 #: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 
 #: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "


@@ -98,9 +98,8 @@ msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
 #: cmdline/apt-cache.cc:1273
 msgstr "软件包文件 %s 尚未同步。"
 
 #: cmdline/apt-cache.cc:1273

-#, fuzzy

 msgid "You must give at least one search pattern"
 msgid "You must give at least one search pattern"

-msgstr "您必须明确地给出一个表达式"
+msgstr "您必须明确地给出至少一个表达式"

 
 #: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
 #: cmdline/apt-cache.cc:1508
 
 #: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
 #: cmdline/apt-cache.cc:1508


@@ -158,7 +157,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1739
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1739

-#, fuzzy

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"


@@ -216,6 +214,7 @@ msgstr ""
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"

+"   showauto - 显示自动安装的软件包的列表\n"

 "   depends - 显示该软件包的依赖关系信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   depends - 显示该软件包的依赖关系信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"


@@ -242,9 +241,9 @@ msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 
 #: cmdline/apt-cdrom.cc:127
 msgstr "请把盘片插入驱动器再按回车键"
 
 #: cmdline/apt-cdrom.cc:127

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to mount '%s' to '%s'"
 msgid "Failed to mount '%s' to '%s'"

-msgstr "无法将 %s 重命名为 %s"
+msgstr "无法将 %s 挂载到 %s"

 
 #: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
 
 #: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."


@@ -444,7 +443,6 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "数据库已过期，现尝试进行升级 %s"
 
 #: ftparchive/cachedb.cc:72
 msgstr "数据库已过期，现尝试进行升级 %s"
 
 #: ftparchive/cachedb.cc:72

-#, fuzzy

 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."


@@ -756,19 +754,19 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
 #: cmdline/apt-get.cc:634
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
 #: cmdline/apt-get.cc:634

-#, fuzzy, c-format
+#, c-format

 msgid "Note, selecting '%s' for task '%s'\n"
 msgid "Note, selecting '%s' for task '%s'\n"

-msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
+msgstr "注意，为任务 %2$s 选中了 %1$s\n"

 
 #: cmdline/apt-get.cc:640
 
 #: cmdline/apt-get.cc:640

-#, fuzzy, c-format
+#, c-format

 msgid "Note, selecting '%s' for regex '%s'\n"
 msgid "Note, selecting '%s' for regex '%s'\n"

-msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
+msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"

 
 #: cmdline/apt-get.cc:647
 
 #: cmdline/apt-get.cc:647

-#, fuzzy, c-format
+#, c-format

 msgid "Selected version '%s' (%s) for '%s'\n"
 msgid "Selected version '%s' (%s) for '%s'\n"

-msgstr "选定了版本为 %s (%s) 的 %s\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"

 
 #: cmdline/apt-get.cc:657
 #, c-format
 
 #: cmdline/apt-get.cc:657
 #, c-format


@@ -780,9 +778,8 @@ msgid " [Installed]"
 msgstr " [已安装]"
 
 #: cmdline/apt-get.cc:677
 msgstr " [已安装]"
 
 #: cmdline/apt-get.cc:677

-#, fuzzy

 msgid " [Not candidate version]"
 msgid " [Not candidate version]"

-msgstr "候选版本"
+msgstr " [无候选版本]"

 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."


@@ -804,17 +801,17 @@ msgid "However the following packages replace it:"
 msgstr "可是下列软件包取代了它："
 
 #: cmdline/apt-get.cc:712
 msgstr "可是下列软件包取代了它："
 
 #: cmdline/apt-get.cc:712

-#, fuzzy, c-format
+#, c-format

 msgid "Package '%s' has no installation candidate"
 msgid "Package '%s' has no installation candidate"

-msgstr "软件包 %s 还没有可供安装的候选者"
+msgstr "软件包 %s 没有可供安装的候选者"

 
 #: cmdline/apt-get.cc:723
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 
 #: cmdline/apt-get.cc:723
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"

-msgstr ""
+msgstr "类似 %s 的虚拟软件包可以卸载\n"

 
 #: cmdline/apt-get.cc:754
 
 #: cmdline/apt-get.cc:754

-#, fuzzy, c-format
+#, c-format

 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注意，选取 %s 而非 %s\n"
 
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注意，选取 %s 而非 %s\n"
 


@@ -824,9 +821,9 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
 #: cmdline/apt-get.cc:788
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
 #: cmdline/apt-get.cc:788

-#, fuzzy, c-format
+#, c-format

 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"

-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"

 
 #: cmdline/apt-get.cc:798
 #, c-format
 
 #: cmdline/apt-get.cc:798
 #, c-format


@@ -1015,28 +1012,27 @@ msgid ""
 msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"

-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："

 
 #: cmdline/apt-get.cc:1324
 msgid "Note: This is done automatic and on purpose by dpkg."
 
 #: cmdline/apt-get.cc:1324
 msgid "Note: This is done automatic and on purpose by dpkg."

-msgstr ""
+msgstr "注意：这是自动被 dpkg 有意完成的。"

 
 #: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 
 #: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"

-msgstr ""
+msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"

 
 #: cmdline/apt-get.cc:1486
 
 #: cmdline/apt-get.cc:1486

-#, fuzzy, c-format
+#, c-format

 msgid "Picking '%s' as source package instead of '%s'\n"
 msgid "Picking '%s' as source package instead of '%s'\n"

-msgstr "无法获取源软件包列表 %s 的状态"
+msgstr "选择 %s 作为源代码包而非 %s\n"

 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"

-msgstr ""
+msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"

 
 #: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 
 #: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"


@@ -1048,31 +1044,35 @@ msgstr "我们不应该进行删除，无法启动自动删除器"
 
 #: cmdline/apt-get.cc:1653
 #, fuzzy
 
 #: cmdline/apt-get.cc:1653
 #, fuzzy

+#| msgid ""
+#| "The following package is automatically installed and is no longer "
+#| "required:"
+#| msgid_plural ""
+#| "The following packages were automatically installed and are no longer "
+#| "required:"

 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："

-msgstr[1] "下列软件包是自动安装的并且现在不需要了："

 
 #: cmdline/apt-get.cc:1657
 
 #: cmdline/apt-get.cc:1657

-#, fuzzy, c-format
+#, c-format

 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"

-msgstr[0] "%lu 个自动安装的的软件包现在不需要了\n"
-msgstr[1] "%lu 个自动安装的的软件包现在不需要了\n"
+msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"

 
 #: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 
 #: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."

-msgstr "使ç\94¨'apt-get autoremove'æ\9d¥å\88 é\99¤它们"
+msgstr "使ç\94¨'apt-get autoremove'æ\9d¥å\8d¸è½½它们"

 
 #: cmdline/apt-get.cc:1664
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 
 #: cmdline/apt-get.cc:1664
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."

-msgstr "ä¼¼ä¹\8eè\87ªå\8a¨å\88 é\99¤工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
+msgstr "ä¼¼ä¹\8eè\87ªå\8a¨å\8d¸è½½工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"

 
 #.
 #. if (Packages == 1)
 
 #.
 #. if (Packages == 1)


@@ -1090,7 +1090,7 @@ msgstr "下列信息可能会对解决问题有所帮助："
 
 #: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 
 #: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"

-msgstr "å\86\85é\83¨é\94\99误ï¼\8cè\87ªå\8a¨å\88 é\99¤工具坏事了"
+msgstr "å\86\85é\83¨é\94\99误ï¼\8cè\87ªå\8a¨å\8d¸è½½工具坏事了"

 
 #: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 
 #: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"


@@ -1141,7 +1141,7 @@ msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
 #: cmdline/apt-get.cc:1981
 msgstr "无法找到软件包 %s"
 
 #: cmdline/apt-get.cc:1981

-#, fuzzy, c-format
+#, c-format

 msgid "%s set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 


@@ -1180,6 +1180,8 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""

+"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
+"%s\n"

 
 #: cmdline/apt-get.cc:2246
 #, c-format
 
 #: cmdline/apt-get.cc:2246
 #, c-format


@@ -1188,6 +1190,9 @@ msgid ""
 "bzr get %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "bzr get %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""

+"请使用：\n"
+"bzr get %s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"

 
 #: cmdline/apt-get.cc:2297
 #, c-format
 
 #: cmdline/apt-get.cc:2297
 #, c-format


@@ -1296,7 +1301,6 @@ msgid "Supported modules:"
 msgstr "支持的模块："
 
 #: cmdline/apt-get.cc:2786
 msgstr "支持的模块："
 
 #: cmdline/apt-get.cc:2786

-#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1351,17 +1355,19 @@ msgstr ""
 "命令：\n"
 "   update - 取回更新的软件包列表信息\n"
 "   upgrade - 进行一次升级\n"
 "命令：\n"
 "   update - 取回更新的软件包列表信息\n"
 "   upgrade - 进行一次升级\n"

-"   install - 安装新的软件包(注：包名是 libc6 而非 libc6.deb)\n"
+"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"

 "   remove - 卸载软件包\n"
 "   autoremove - 卸载所有自动安装且不再使用的软件包\n"
 "   purge - 卸载并清除软件包的配置\n"
 "   source - 下载源码包文件\n"
 "   remove - 卸载软件包\n"
 "   autoremove - 卸载所有自动安装且不再使用的软件包\n"
 "   purge - 卸载并清除软件包的配置\n"
 "   source - 下载源码包文件\n"

-"   build-dep - 为源码包配置所需的构建依赖关系\n"
+"   build-dep - 为源码包配置所需的编译依赖关系\n"

 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
 "   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"
 "   autoclean - 删除老版本的已下载的包文件\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"
 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
 "   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"
 "   autoclean - 删除老版本的已下载的包文件\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"

+"   markauto - 标记指定的软件包为自动安装\n"
+"   unmarkauto - 标记指定的软件包为手动安装\n"

 "\n"
 "选项：\n"
 "  -h  本帮助文档。\n"
 "\n"
 "选项：\n"
 "  -h  本帮助文档。\n"


@@ -1644,7 +1650,7 @@ msgstr "无法读取 %s 的状态"
 #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
 #, c-format
 msgid "Failed to remove %s"
 #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
 #, c-format
 msgid "Failed to remove %s"

-msgstr "æ\97 æ³\95å\88 é\99¤ %s"
+msgstr "æ\97 æ³\95å\8d¸è½½ %s"

 
 #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
 #, c-format
 
 #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
 #, c-format


@@ -2013,9 +2019,9 @@ msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
 #: methods/connect.cc:196
 msgstr "暂时不能解析域名“%s”"
 
 #: methods/connect.cc:196

-#, fuzzy, c-format
+#, c-format

 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"

-msgstr "解析“%s:%s”时，出现了某些故障(%i)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"

 
 #: methods/connect.cc:243
 #, c-format
 
 #: methods/connect.cc:243
 #, c-format


@@ -2024,9 +2030,9 @@ msgstr "不能连接到 %s：%s："
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: methods/gpgv.cc:71
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: methods/gpgv.cc:71

-#, fuzzy, c-format
+#, c-format

 msgid "No keyring installed in %s."
 msgid "No keyring installed in %s."

-msgstr "中止安装。"
+msgstr "%s 中没有安装密钥环。"

 
 #: methods/gpgv.cc:163
 msgid ""
 
 #: methods/gpgv.cc:163
 msgid ""


@@ -2038,9 +2044,8 @@ msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
 #: methods/gpgv.cc:172
 msgstr "至少发现一个无效的签名。"
 
 #: methods/gpgv.cc:172

-#, fuzzy

 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"

-msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)"
+msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"

 
 #: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 
 #: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"


@@ -2138,9 +2143,9 @@ msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
 #: apt-pkg/contrib/mmap.cc:89
 msgstr "无法 mmap 一个空文件"
 
 #: apt-pkg/contrib/mmap.cc:89

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't duplicate file descriptor %i"
 msgid "Couldn't duplicate file descriptor %i"

-msgstr "无法为 %s 开启管道"
+msgstr "无法为复制文件描述符 %i"

 
 #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
 
 #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format


@@ -2148,14 +2153,12 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
 #: apt-pkg/contrib/mmap.cc:124
 msgstr "无法 mmap %lu 字节的数据"
 
 #: apt-pkg/contrib/mmap.cc:124

-#, fuzzy

 msgid "Unable to close mmap"
 msgid "Unable to close mmap"

-msgstr "无法打开 %s"
+msgstr "无法关闭 mmap"

 
 #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
 
 #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180

-#, fuzzy

 msgid "Unable to synchronize mmap"
 msgid "Unable to synchronize mmap"

-msgstr "无法调用 "
+msgstr "无法同步 mmap "

 
 #: apt-pkg/contrib/mmap.cc:300
 #, c-format
 
 #: apt-pkg/contrib/mmap.cc:300
 #, c-format


@@ -2171,12 +2174,12 @@ msgstr ""
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."

-msgstr ""
+msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"

 
 #: apt-pkg/contrib/mmap.cc:402
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 
 #: apt-pkg/contrib/mmap.cc:402
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."

-msgstr ""
+msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"

 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371


@@ -2230,12 +2233,12 @@ msgstr "语法错误 %s:%u：标签格式有误"
 #: apt-pkg/contrib/configuration.cc:714
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 #: apt-pkg/contrib/configuration.cc:714
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"

-msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"

 
 #: apt-pkg/contrib/configuration.cc:754
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 
 #: apt-pkg/contrib/configuration.cc:754
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"

-msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"

 
 #: apt-pkg/contrib/configuration.cc:761
 #, c-format
 
 #: apt-pkg/contrib/configuration.cc:761
 #, c-format


@@ -2245,22 +2248,22 @@ msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 #: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 #: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Included from here"

-msgstr "语法错误 %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"

 
 #: apt-pkg/contrib/configuration.cc:774
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 
 #: apt-pkg/contrib/configuration.cc:774
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"

-msgstr "语法错误 %s:%u: 不支持的指令“%s”"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"

 
 #: apt-pkg/contrib/configuration.cc:777
 
 #: apt-pkg/contrib/configuration.cc:777

-#, fuzzy, c-format
+#, c-format

 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"

-msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
+msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"

 
 #: apt-pkg/contrib/configuration.cc:827
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 
 #: apt-pkg/contrib/configuration.cc:827
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"

-msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"

 
 #: apt-pkg/contrib/progress.cc:153
 #, c-format
 
 #: apt-pkg/contrib/progress.cc:153
 #, c-format


@@ -2385,9 +2388,9 @@ msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
 #: apt-pkg/contrib/fileutl.cc:714
 msgstr "无法打开文件 %s"
 
 #: apt-pkg/contrib/fileutl.cc:714

-#, fuzzy, c-format
+#, c-format

 msgid "Could not open file descriptor %d"
 msgid "Could not open file descriptor %d"

-msgstr "无法为 %s 开启管道"
+msgstr "无法打开文件描述符 %d"

 
 #: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 
 #: apt-pkg/contrib/fileutl.cc:774
 #, c-format


@@ -2400,24 +2403,24 @@ msgid "write, still have %lu to write but couldn't"
 msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
 #: apt-pkg/contrib/fileutl.cc:906
 msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
 #: apt-pkg/contrib/fileutl.cc:906

-#, fuzzy, c-format
+#, c-format

 msgid "Problem closing the gzip file %s"
 msgid "Problem closing the gzip file %s"

-msgstr "关闭文件出错"
+msgstr "关闭 gzip %s 文件出错"

 
 #: apt-pkg/contrib/fileutl.cc:909
 
 #: apt-pkg/contrib/fileutl.cc:909

-#, fuzzy, c-format
+#, c-format

 msgid "Problem closing the file %s"
 msgid "Problem closing the file %s"

-msgstr "关闭文件出错"
+msgstr "关闭文件 %s 出错"

 
 #: apt-pkg/contrib/fileutl.cc:914
 
 #: apt-pkg/contrib/fileutl.cc:914

-#, fuzzy, c-format
+#, c-format

 msgid "Problem renaming the file %s to %s"
 msgid "Problem renaming the file %s to %s"

-msgstr "同步文件出错"
+msgstr "重命名文件 %s 为 %s 出错"

 
 #: apt-pkg/contrib/fileutl.cc:925
 
 #: apt-pkg/contrib/fileutl.cc:925

-#, fuzzy, c-format
+#, c-format

 msgid "Problem unlinking the file %s"
 msgid "Problem unlinking the file %s"

-msgstr "用 unlink 删除文件出错"
+msgstr "用 unlink 删除文件 %s 出错"

 
 #: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 
 #: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"


@@ -2529,7 +2532,7 @@ msgstr "无法写入临时状态文件 %s"
 #: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 #: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"

-msgstr ""
+msgstr "内部错误，组 %s 没有可安装的 pseudo 软件包"

 
 #: apt-pkg/tagfile.cc:102
 #, c-format
 
 #: apt-pkg/tagfile.cc:102
 #, c-format


@@ -2542,29 +2545,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
 #: apt-pkg/sourcelist.cc:92
 msgstr "无法解析软件包文件 %s (2)"
 
 #: apt-pkg/sourcelist.cc:92

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgid "Malformed line %lu in source list %s ([option] unparseable)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"

 
 #: apt-pkg/sourcelist.cc:95
 
 #: apt-pkg/sourcelist.cc:95

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgid "Malformed line %lu in source list %s ([option] too short)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"

 
 #: apt-pkg/sourcelist.cc:106
 
 #: apt-pkg/sourcelist.cc:106

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"

 
 #: apt-pkg/sourcelist.cc:112
 
 #: apt-pkg/sourcelist.cc:112

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgid "Malformed line %lu in source list %s ([%s] has no key)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"

 
 #: apt-pkg/sourcelist.cc:115
 
 #: apt-pkg/sourcelist.cc:115

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"

 
 #: apt-pkg/sourcelist.cc:128
 #, c-format
 
 #: apt-pkg/sourcelist.cc:128
 #, c-format


@@ -2617,6 +2620,8 @@ msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""

+"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
+"(%d)"

 
 #: apt-pkg/packagemanager.cc:452
 #, c-format
 
 #: apt-pkg/packagemanager.cc:452
 #, c-format


@@ -2635,6 +2640,8 @@ msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
 "see man 5 apt.conf under APT::Immediate-Configure for details."
 msgstr ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
 "see man 5 apt.conf under APT::Immediate-Configure for details."
 msgstr ""

+"无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-"
+"Configure。"

 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format


@@ -2669,19 +2676,19 @@ msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 #: apt-pkg/acquire.cc:79
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 #: apt-pkg/acquire.cc:79

-#, fuzzy, c-format
+#, c-format

 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 
 #: apt-pkg/acquire.cc:83
 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 
 #: apt-pkg/acquire.cc:83

-#, fuzzy, c-format
+#, c-format

 msgid "Archives directory %spartial is missing."
 msgid "Archives directory %spartial is missing."

-msgstr "找不到“%spartial”目录。"
+msgstr "仓库目录 %spartial 确实。"

 
 #: apt-pkg/acquire.cc:91
 
 #: apt-pkg/acquire.cc:91

-#, fuzzy, c-format
+#, c-format

 msgid "Unable to lock directory %s"
 msgid "Unable to lock directory %s"

-msgstr "æ\97 æ³\95对ç\8a¶æ\80\81å\88\97表ç\9b®å½\95加锁"
+msgstr "æ\97 æ³\95对ç\9b®å½\95 %s 加锁"

 
 #. only show the ETA if it makes sense
 #. two days
 
 #. only show the ETA if it makes sense
 #. two days


@@ -2781,9 +2788,9 @@ msgstr "处理 %s (NewFileVer1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324

-#, fuzzy, c-format
+#, c-format

 msgid "Error occurred while processing %s (NewVersion%d)"
 msgid "Error occurred while processing %s (NewVersion%d)"

-msgstr "处理 %s (NewVersion1)时出错"
+msgstr "处理 %s (NewVersion%d)时出错"

 
 #: apt-pkg/pkgcachegen.cc:320
 #, c-format
 
 #: apt-pkg/pkgcachegen.cc:320
 #, c-format


@@ -2863,12 +2870,12 @@ msgstr "以下 ID 的密钥没有可用的公钥：\n"
 #: apt-pkg/acquire-item.cc:1277
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"
 #: apt-pkg/acquire-item.cc:1277
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"

-msgstr ""
+msgstr "Release 文件已过期，忽略 %s (从 %s 起无效)"

 
 #: apt-pkg/acquire-item.cc:1298
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 
 #: apt-pkg/acquire-item.cc:1298
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"

-msgstr ""
+msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"

 
 #: apt-pkg/acquire-item.cc:1324
 #, c-format
 
 #: apt-pkg/acquire-item.cc:1324
 #, c-format


@@ -2876,11 +2883,12 @@ msgid ""
 "A error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used.GPG error: %s: %s\n"
 msgstr ""
 "A error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used.GPG error: %s: %s\n"
 msgstr ""

+"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"

 
 #: apt-pkg/acquire-item.cc:1333
 #, c-format
 msgid "GPG error: %s: %s"
 
 #: apt-pkg/acquire-item.cc:1333
 #, c-format
 msgid "GPG error: %s: %s"

-msgstr ""
+msgstr "GPG 错误：%s: %s"

 
 #: apt-pkg/acquire-item.cc:1361
 #, c-format
 
 #: apt-pkg/acquire-item.cc:1361
 #, c-format


@@ -2925,14 +2933,14 @@ msgid "No Hash entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
 #: apt-pkg/indexrecords.cc:107
 msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
 #: apt-pkg/indexrecords.cc:107

-#, fuzzy, c-format
+#, c-format

 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgid "Invalid 'Valid-Until' entry in Release file %s"

-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"

 
 #: apt-pkg/indexrecords.cc:122
 
 #: apt-pkg/indexrecords.cc:122

-#, fuzzy, c-format
+#, c-format

 msgid "Invalid 'Date' entry in Release file %s"
 msgid "Invalid 'Date' entry in Release file %s"

-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"

 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format


@@ -3051,19 +3059,19 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
 #: apt-pkg/indexcopy.cc:532
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
 #: apt-pkg/indexcopy.cc:532

-#, fuzzy, c-format
+#, c-format

 msgid "Skipping nonexistent file %s"
 msgid "Skipping nonexistent file %s"

-msgstr "正在打开配置文件 %s"
+msgstr "跳过不存在的文件 %s"

 
 #: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 
 #: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"

-msgstr ""
+msgstr "无法找到认证记录：%s"

 
 #: apt-pkg/indexcopy.cc:544
 
 #: apt-pkg/indexcopy.cc:544

-#, fuzzy, c-format
+#, c-format

 msgid "Hash mismatch for: %s"
 msgid "Hash mismatch for: %s"

-msgstr "Hash 校验和不符"
+msgstr "Hash 校验和不符：%s"

 
 #: apt-pkg/cacheset.cc:337
 #, c-format
 
 #: apt-pkg/cacheset.cc:337
 #, c-format


@@ -3076,41 +3084,41 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
 #: apt-pkg/cacheset.cc:447
 msgstr "未找到“%2$s”的“%1$s”版本"
 
 #: apt-pkg/cacheset.cc:447

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 
 #: apt-pkg/cacheset.cc:454
 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 
 #: apt-pkg/cacheset.cc:454

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't find any package by regex '%s'"
 msgid "Couldn't find any package by regex '%s'"

-msgstr "æ\97 æ³\95æ\89¾å\88°è½¯ä»¶å\8c\85 %s"
+msgstr "æ\97 æ³\95æ\8c\89ç\85§æ­£å\88\99表达å¼\8f %s æ\89¾å\88°ä»»ä½\95软件å\8c\85"

 
 #: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Can't select versions from package '%s' as it purely virtual"
 
 #: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Can't select versions from package '%s' as it purely virtual"

-msgstr ""
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"

 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"

-msgstr ""
+msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"

 
 #: apt-pkg/cacheset.cc:491
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 
 #: apt-pkg/cacheset.cc:491
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"

-msgstr ""
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"

 
 #: apt-pkg/cacheset.cc:499
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 
 #: apt-pkg/cacheset.cc:499
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"

-msgstr ""
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"

 
 #: apt-pkg/cacheset.cc:507
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 
 #: apt-pkg/cacheset.cc:507
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"

-msgstr ""
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"

 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format


@@ -3128,14 +3136,14 @@ msgid "Removing %s"
 msgstr "正在删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:55
 msgstr "正在删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:55

-#, fuzzy, c-format
+#, c-format

 msgid "Completely removing %s"
 msgid "Completely removing %s"

-msgstr "完全删除了 %s"
+msgstr "完全删除 %s"

 
 #: apt-pkg/deb/dpkgpm.cc:56
 #, c-format
 msgid "Noting disappearance of %s"
 
 #: apt-pkg/deb/dpkgpm.cc:56
 #, c-format
 msgid "Noting disappearance of %s"

-msgstr ""
+msgstr "注意到 %s 已经消失"

 
 #: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 
 #: apt-pkg/deb/dpkgpm.cc:57
 #, c-format


@@ -3145,10 +3153,10 @@ msgstr "执行安装后执行的触发器 %s"
 #: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 #: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"

-msgstr "目录 %s 不见了"
+msgstr "目录 %s 缺失"

 
 #: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 
 #: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671

-#, fuzzy, c-format
+#, c-format

 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 


@@ -3202,35 +3210,35 @@ msgstr "正在运行 dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1273
 msgid "No apport report written because MaxReports is reached already"
 
 #: apt-pkg/deb/dpkgpm.cc:1273
 msgid "No apport report written because MaxReports is reached already"

-msgstr ""
+msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"

 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1278
 msgid "dependency problems - leaving unconfigured"
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1278
 msgid "dependency problems - leaving unconfigured"

-msgstr ""
+msgstr "依赖问题 - 保持未配置"

 
 #: apt-pkg/deb/dpkgpm.cc:1280
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 
 #: apt-pkg/deb/dpkgpm.cc:1280
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."

-msgstr ""
+msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"

 
 #: apt-pkg/deb/dpkgpm.cc:1286
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 
 #: apt-pkg/deb/dpkgpm.cc:1286
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"

-msgstr ""
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"

 
 #: apt-pkg/deb/dpkgpm.cc:1292
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 
 #: apt-pkg/deb/dpkgpm.cc:1292
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"

-msgstr ""
+msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"

 
 #: apt-pkg/deb/dpkgpm.cc:1299
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 
 #: apt-pkg/deb/dpkgpm.cc:1299
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"

-msgstr ""
+msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"

 
 #: apt-pkg/deb/debsystem.cc:69
 #, c-format
 
 #: apt-pkg/deb/debsystem.cc:69
 #, c-format


@@ -3247,10 +3255,10 @@ msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
 #: apt-pkg/deb/debsystem.cc:88
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
 #: apt-pkg/deb/debsystem.cc:88

-#, fuzzy, c-format
+#, c-format

 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "

-msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此问题。"
+msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"

 
 #: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 
 #: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"


@@ -3261,26 +3269,26 @@ msgstr "未锁定"
 #: methods/mirror.cc:200
 #, c-format
 msgid "No mirror file '%s' found "
 #: methods/mirror.cc:200
 #, c-format
 msgid "No mirror file '%s' found "

-msgstr ""
+msgstr "没有找到镜像文件 %s"

 
 #: methods/mirror.cc:343
 #, c-format
 msgid "[Mirror: %s]"
 
 #: methods/mirror.cc:343
 #, c-format
 msgid "[Mirror: %s]"

-msgstr ""
+msgstr "[镜像：%s]"

 
 #: methods/rred.cc:465
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 
 #: methods/rred.cc:465
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."

-msgstr ""
+msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"

 
 #: methods/rred.cc:470
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 
 #: methods/rred.cc:470
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."

-msgstr ""
+msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"

 
 #: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 
 #: methods/rsh.cc:329
 msgid "Connection closed prematurely"