From b6c6b52fbb09df15933ab9ec8a3d98d2643b1268 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 30 Jul 2010 12:48:15 +0200
Subject: [PATCH] refresh po/pot files in doc/ and po/

---
 debian/changelog   |    2 +-
 doc/po/apt-doc.pot | 1427 ++++++++++++++++++++-----------------
 doc/po/de.po       | 1682 +++++++++++++++++++++++++------------------
 doc/po/es.po       | 1681 +++++++++++++++++++++++++------------------
 doc/po/fr.po       | 1683 ++++++++++++++++++++++++++------------------
 doc/po/it.po       | 1462 ++++++++++++++++++++------------------
 doc/po/ja.po       | 1601 +++++++++++++++++++++++------------------
 doc/po/pl.po       | 1609 ++++++++++++++++++++++++------------------
 doc/po/pt.po       | 1682 +++++++++++++++++++++++++------------------
 doc/po/pt_BR.po    | 1467 ++++++++++++++++++++------------------
 po/apt-all.pot     |  478 ++++++-------
 po/ar.po           | 1004 ++++++++++++++------------
 po/ast.po          | 1027 +++++++++++++++------------
 po/bg.po           | 1024 +++++++++++++++------------
 po/bs.po           |  986 ++++++++++++++------------
 po/ca.po           | 1042 +++++++++++++++------------
 po/cs.po           | 1025 +++++++++++++++------------
 po/cy.po           | 1024 +++++++++++++++------------
 po/da.po           | 1040 +++++++++++++++------------
 po/de.po           | 1069 ++++++++++++++++------------
 po/dz.po           | 1036 +++++++++++++++------------
 po/el.po           | 1027 +++++++++++++++------------
 po/en_GB.po        | 1024 +++++++++++++++------------
 po/es.po           | 1035 +++++++++++++++------------
 po/eu.po           | 1020 +++++++++++++++------------
 po/fi.po           | 1028 +++++++++++++++------------
 po/fr.po           | 1054 +++++++++++++++------------
 po/gl.po           | 1022 +++++++++++++++------------
 po/hu.po           | 1020 +++++++++++++++------------
 po/it.po           | 1353 ++++++++++++++++++++---------------
 po/ja.po           | 1030 +++++++++++++++------------
 po/km.po           | 1024 +++++++++++++++------------
 po/ko.po           | 1024 +++++++++++++++------------
 po/ku.po           |  992 ++++++++++++++------------
 po/lt.po           | 1012 ++++++++++++++------------
 po/mr.po           | 1026 +++++++++++++++------------
 po/nb.po           | 1047 +++++++++++++++------------
 po/ne.po           | 1024 +++++++++++++++------------
 po/nl.po           | 1047 +++++++++++++++------------
 po/nn.po           | 1038 +++++++++++++++------------
 po/pl.po           | 1029 +++++++++++++++------------
 po/pt.po           | 1037 +++++++++++++++------------
 po/pt_BR.po        | 1032 +++++++++++++++------------
 po/ro.po           | 1027 +++++++++++++++------------
 po/ru.po           | 1046 +++++++++++++++------------
 po/sk.po           | 1346 ++++++++++++++++++++---------------
 po/sl.po           | 1020 +++++++++++++++------------
 po/sv.po           | 1027 +++++++++++++++------------
 po/th.po           | 1025 +++++++++++++++------------
 po/tl.po           | 1036 +++++++++++++++------------
 po/uk.po           | 1036 +++++++++++++++------------
 po/vi.po           | 1038 +++++++++++++++------------
 po/zh_CN.po        | 1029 +++++++++++++++------------
 po/zh_TW.po        | 1024 +++++++++++++++------------
 54 files changed, 33660 insertions(+), 25990 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1235a0266..dd2cc6e93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 apt (0.8.0~pre1) unstable; urgency=low
 
   * merge of the debian-expermental-ma branch
-    
+  * refresh po/pot files in doc/ and po/
 
  -- Michael Vogt <mvo@debian.org>  Fri, 30 Jul 2010 12:42:57 +0200
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index d0b0046ae..cf67240b3 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -403,17 +403,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -422,7 +411,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -440,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -448,7 +437,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -459,7 +448,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -472,7 +461,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -485,7 +474,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -497,7 +486,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -506,7 +495,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -518,7 +507,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -529,7 +518,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -546,7 +535,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -560,7 +549,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -575,7 +564,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -588,7 +577,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -608,7 +597,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -628,7 +617,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -645,7 +634,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -657,7 +646,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -669,7 +658,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -681,7 +670,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     "
@@ -694,7 +683,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -710,7 +699,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     "
@@ -723,7 +712,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -735,7 +724,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     "
@@ -748,7 +737,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -762,7 +751,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     "
@@ -775,7 +764,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -788,7 +777,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, no-wrap
 msgid ""
 "     "
@@ -803,7 +792,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:375
+#: apt.ent:373
+#, no-wrap
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      "
+"<varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - "
@@ -814,7 +817,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has "
@@ -833,7 +836,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of "
@@ -852,6 +855,13 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> "
+"<!ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -910,7 +920,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
+#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
 msgid "Description"
 msgstr ""
 
@@ -924,7 +934,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1300,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr ""
 
@@ -1323,7 +1333,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362 apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr ""
 
@@ -1343,12 +1353,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1380,34 +1390,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+msgid "<option>--no-pre-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+msgid "<option>--no-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+msgid "<option>--no-recommends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+msgid "<option>--no-suggests</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+msgid "<option>--no-conflicts</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+msgid "<option>--no-breaks</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+msgid "<option>--no-replaces</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+msgid "<option>--no-enhances</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:320
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be twicked with these flags which will omit "
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1418,17 +1478,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1437,29 +1497,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1467,12 +1527,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1480,12 +1540,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
@@ -1493,37 +1553,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547 apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637 sources.list.5.xml:233
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562 apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651 sources.list.5.xml:233
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568 apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1622,7 +1682,7 @@ msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1658,7 +1718,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr ""
 
@@ -1703,17 +1763,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr ""
 
@@ -1817,7 +1877,7 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618 apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619 apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr ""
 
@@ -1878,7 +1938,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr ""
 
@@ -2056,17 +2116,17 @@ msgid ""
 "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>."
+"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2076,24 +2136,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2104,17 +2164,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2123,12 +2183,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2136,44 +2196,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the "
 "<literal>FileList</literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2181,12 +2241,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2195,72 +2255,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 msgid "Translation::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section "
@@ -2268,36 +2328,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 msgid "LongDescription"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2305,12 +2365,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each "
 "day. The contents files are round-robined so that over several days they "
@@ -2318,12 +2378,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is "
@@ -2334,60 +2394,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 msgid ""
 "Sets the output Sources file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 msgid "Translation"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to "
@@ -2395,12 +2455,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to "
@@ -2408,12 +2468,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2423,34 +2483,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2458,12 +2518,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2472,12 +2532,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2487,16 +2547,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:364
 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>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2504,7 +2564,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2514,7 +2574,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 msgid ""
 "When processing a <literal>Tree</literal> section "
 "<command>apt-ftparchive</command> performs an operation similar to: "
@@ -2522,12 +2582,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib "
@@ -2535,12 +2595,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2548,56 +2608,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2607,64 +2667,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -2674,19 +2734,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2697,12 +2757,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2710,12 +2770,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -2723,12 +2783,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -2736,19 +2796,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2757,12 +2817,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2771,12 +2831,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2786,12 +2846,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -2799,24 +2859,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2825,12 +2885,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2844,12 +2904,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2859,12 +2919,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491 sources.list.5.xml:193
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -2873,14 +2933,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2910,28 +2970,24 @@ 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 "
+"<option>-t=</option> <arg choice='plain'> "
+"<replaceable>target_release</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>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\" "
+"/<replaceable>target_release</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 "
+"<arg choice='plain'> /<replaceable>target_release</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 "
@@ -2942,21 +2998,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:112
 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;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -2971,12 +3027,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -2992,12 +3048,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, "
@@ -3008,12 +3064,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3027,12 +3083,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3048,7 +3104,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3059,14 +3115,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more "
 "already-installed packages without upgrading every package you have on your "
@@ -3078,14 +3134,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3097,12 +3153,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3112,12 +3168,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3125,12 +3181,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3142,7 +3198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via "
 "<literal>deb-src</literal> type lines in the &sources-list; file. This means "
@@ -3153,7 +3209,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -3162,7 +3218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3172,7 +3228,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3180,31 +3236,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3216,12 +3272,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3233,12 +3289,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -3246,36 +3302,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -3291,17 +3347,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3313,12 +3369,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with "
 "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -3327,7 +3383,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3339,17 +3395,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: "
@@ -3357,7 +3413,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking "
 "(<literal>Debug::NoLocking</literal>)  automatic. Also a notice will be "
@@ -3369,7 +3425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3378,22 +3434,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -3403,83 +3459,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -3488,12 +3544,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -3502,12 +3558,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 msgid "<option>--only-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 msgid ""
 "Do not install new packages; When used in conjunction with "
 "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
@@ -3516,12 +3572,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -3531,12 +3587,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -3549,12 +3605,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be "
@@ -3564,24 +3620,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -3592,17 +3648,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -3617,12 +3673,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where "
@@ -3632,24 +3688,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running "
@@ -3658,12 +3714,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -3675,22 +3731,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3699,24 +3755,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: "
@@ -3724,14 +3780,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3739,29 +3795,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr ""
 
@@ -4076,26 +4132,18 @@ msgstr ""
 msgid "Show the program version."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: "
-"<literal>Dir::State</literal> sets the path to the "
-"<filename>extended_states</filename> file."
+msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -4616,29 +4664,29 @@ msgstr ""
 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;."
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -4647,12 +4695,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -4685,12 +4733,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a "
@@ -4701,82 +4749,132 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not "
+"enough. These value will be applied again and again until either the cache "
+"is big enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of "
+"<literal>Cache-Limit</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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was "
+"created. The default is \"for ever\" (0) if the Release file of the archive "
+"doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+"this date is the default. The date from the Release file or the date "
+"specified by the creation time of the Release file (<literal>Date</literal> "
+"header) plus the seconds specified with this options are used to check if "
+"the validation of a file has expired by using the earlier date of the "
+"two. Archive specific settings can be made by appending the label of the "
+"archive to the option name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -4787,12 +4885,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4802,36 +4900,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4843,7 +4941,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4857,7 +4955,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -4865,7 +4963,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -4877,7 +4975,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4887,7 +4985,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4895,12 +4993,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -4910,7 +5008,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4932,12 +5030,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4957,7 +5055,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -4967,7 +5065,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4977,7 +5075,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4987,18 +5085,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -5011,12 +5109,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -5024,12 +5122,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -5037,7 +5135,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -5049,19 +5147,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -5078,13 +5176,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -5099,7 +5197,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -5109,12 +5207,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -5123,12 +5221,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
@@ -5141,13 +5239,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and "
 "\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
@@ -5170,7 +5268,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" "
@@ -5178,12 +5276,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -5195,7 +5293,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -5208,7 +5306,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5218,7 +5316,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -5226,7 +5324,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -5238,7 +5336,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5250,13 +5348,24 @@ msgid ""
 "looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with "
+"<literal>.disabled</literal>, <literal>~</literal>, <literal>.bak</literal> "
+"or <literal>.dpkg-[a-z]+</literal> is silently ignored. As seen in the last "
+"default value these patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5264,12 +5373,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -5280,50 +5389,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -5331,17 +5440,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5350,12 +5459,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5365,7 +5474,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -5376,36 +5485,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5420,7 +5529,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -5430,7 +5539,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -5444,12 +5553,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -5461,12 +5570,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -5483,12 +5592,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure "
 "--pending</command> to let dpkg handle all required configurations and "
@@ -5500,12 +5609,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5515,12 +5624,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by "
@@ -5532,12 +5641,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5549,7 +5658,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -5563,12 +5672,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -5577,12 +5686,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5593,7 +5702,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5601,7 +5710,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -5609,7 +5718,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5619,110 +5728,110 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5730,92 +5839,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -5825,12 +5934,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -5848,90 +5957,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5939,32 +6048,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
@@ -6079,33 +6188,46 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-msgid "priority 100"
+msgid "priority 1"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their "
+"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" like "
+"the debian experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+msgid "priority 100"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid "to the versions that are not installed and belong to the target release."
 msgstr ""
 
@@ -6118,22 +6240,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:123
 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."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6143,19 +6267,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the "
@@ -6163,7 +6287,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -6174,7 +6298,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -6184,7 +6308,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -6196,12 +6320,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -6210,7 +6334,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -6220,7 +6344,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6229,7 +6353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -6239,7 +6363,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -6247,7 +6371,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6256,7 +6380,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -6265,7 +6389,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6274,7 +6398,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -6284,7 +6408,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is "
@@ -6292,7 +6416,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6301,24 +6425,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:228
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "
-"\"<literal>squeeze</literal>\"."
+"\"<literal>&testing-codename;</literal>\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:232
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6326,7 +6450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6335,82 +6459,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6418,7 +6542,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6427,14 +6551,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6451,12 +6575,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6466,7 +6590,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6474,7 +6598,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an "
@@ -6483,12 +6607,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6496,27 +6620,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -6528,12 +6652,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6544,35 +6668,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:392
 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 "
+"For example, the line \"Codename: &testing-codename;\" 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:"
+"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:401
 #, no-wrap
-msgid "Pin: release n=squeeze\n"
+msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -6583,7 +6707,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6592,12 +6716,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6609,18 +6733,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6629,18 +6753,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6649,27 +6773,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:363
 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>.../dists/&stable-codename;/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\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6684,12 +6808,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6697,12 +6821,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6717,7 +6841,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6727,7 +6851,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564 apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6736,7 +6860,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 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 "
@@ -6745,13 +6869,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6760,12 +6884,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6782,7 +6906,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6793,7 +6917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 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 "
@@ -6802,13 +6926,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6820,20 +6944,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:600
 #, 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"
+"Explanation: other than those in the distribution codenamed with "
+"&testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -6847,7 +6971,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6862,39 +6986,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:617
 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\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:628
 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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
@@ -7037,8 +7161,9 @@ msgstr ""
 #: sources.list.5.xml:114
 #, 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"
+"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 ""
 
@@ -7202,13 +7327,13 @@ msgstr ""
 #: sources.list.5.xml:208
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index 3122a11db..cbb712b39 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.7.24\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2010-04-21 14:04+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -529,22 +529,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -558,7 +542,7 @@ msgstr ""
 ">\n"
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -586,7 +570,7 @@ msgstr ""
 "   <productname>Linux</productname>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -596,7 +580,7 @@ msgstr ""
 "\"> \n"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -612,7 +596,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -632,7 +616,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -652,7 +636,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -670,7 +654,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -682,7 +666,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -700,7 +684,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -716,7 +700,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -742,7 +726,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -762,7 +746,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -786,7 +770,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -806,7 +790,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry>\n"
@@ -842,7 +826,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -870,7 +854,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -896,7 +880,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -912,7 +896,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -928,7 +912,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -944,7 +928,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -960,7 +944,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -983,7 +967,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -999,7 +983,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1015,7 +999,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1031,7 +1015,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -1049,7 +1033,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1065,7 +1049,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY file-sourceslist \"\n"
@@ -1087,7 +1071,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1110,7 +1094,31 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:375
+#: 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"
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+"     <listitem><para>Orte, von denen Pakete geladen werden.\n"
+"     Konfigurationselement: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1119,7 +1127,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"ÜBERSETZUNG\">\n"
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1137,7 +1145,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1152,6 +1160,13 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1237,7 +1252,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -1258,7 +1273,7 @@ msgstr ""
 "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1771,8 +1786,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr "Optionen"
 
@@ -1799,7 +1814,7 @@ msgstr ""
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1827,12 +1842,12 @@ msgstr ""
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1872,17 +1887,91 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-pre-depends</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+#, fuzzy
+#| msgid "<option>--no-download</option>"
+msgid "<option>--no-depends</option>"
+msgstr "<option>--no-download</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+#, fuzzy
+#| msgid "<option>--install-recommends</option>"
+msgid "<option>--no-recommends</option>"
+msgstr "<option>--install-recommends</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-suggests</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+#, fuzzy
+#| msgid "<option>--no-mount</option>"
+msgid "<option>--no-conflicts</option>"
+msgstr "<option>--no-mount</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-breaks</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-replaces</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-enhances</option>"
+msgstr "<option>--no-act</option>"
+
+#. 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 "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+"Macht <literal>depends</literal> und <literal>rdepends</literal> rekursiv, "
+"so dass alle erwähnten Pakete einmal ausgegeben werden. "
+"Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1891,17 +1980,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1918,17 +2007,17 @@ msgstr ""
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1940,17 +2029,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1959,12 +2048,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1975,12 +2064,12 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1991,12 +2080,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2007,46 +2096,46 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr "Dateien"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr "Siehe auch"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr "Diagnose"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2182,7 +2271,7 @@ msgid "Options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2226,7 +2315,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
@@ -2281,17 +2370,17 @@ msgstr ""
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
@@ -2425,7 +2514,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2505,7 +2594,7 @@ msgstr ""
 "XXXX</filename> angegeben wurde"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
@@ -2761,14 +2850,25 @@ msgstr ""
 
 #. 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</"
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "Werte für zusätzliche Metadatenfelder in der Release-Datei werden den "
 "entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> "
@@ -2780,12 +2880,12 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2801,12 +2901,12 @@ msgstr ""
 "Verwaltung der erforderlichen Einstellungen bereitstellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2816,12 +2916,12 @@ msgstr ""
 "Datensätze entfernt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr "Die Generate-Konfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2839,7 +2939,7 @@ msgstr ""
 "wenn die Markierung »scope« behandelt wird."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2847,12 +2947,12 @@ msgstr ""
 "unterhalb beschrieben"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr "Dir-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2866,12 +2966,12 @@ msgstr ""
 "absoluten Pfad zu bilden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2882,32 +2982,32 @@ msgstr ""
 "enthält."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr "Gibt den Ort der Override-Dateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr "Gibt den Ort der Zwischenspeicherdateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2916,12 +3016,12 @@ msgstr ""
 "unterhalb gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr "Vorgabe-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2932,12 +3032,12 @@ msgstr ""
 "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2950,12 +3050,12 @@ msgstr ""
 "»gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata ist ». gzip«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2964,12 +3064,12 @@ msgstr ""
 "Vorgabe ist ».deb«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2978,12 +3078,12 @@ msgstr ""
 "Kompression der Quelldateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2992,12 +3092,12 @@ msgstr ""
 "Vorgabe ist ».dsc«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -3006,14 +3106,14 @@ msgstr ""
 "Kompression der Inhaltsdateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 #, fuzzy
 #| msgid "Contents::Compress"
 msgid "Translation::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 #, fuzzy
 #| msgid ""
 #| "This is similar to <literal>Packages::Compress</literal> except that it "
@@ -3026,12 +3126,12 @@ msgstr ""
 "Kompression der Inhaltsdateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -3042,12 +3142,12 @@ msgstr ""
 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -3056,26 +3156,26 @@ msgstr ""
 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 #, fuzzy
 #| msgid "Description"
 msgid "LongDescription"
 msgstr "Beschreibung"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr "TreeDefault-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3086,12 +3186,12 @@ msgstr ""
 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -3102,12 +3202,12 @@ msgstr ""
 "Tage alle neu gebildet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3125,12 +3225,12 @@ msgstr ""
 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3139,12 +3239,12 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3153,12 +3253,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3167,12 +3267,12 @@ msgstr ""
 "binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 #, fuzzy
 #| msgid ""
 #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3185,14 +3285,14 @@ msgstr ""
 "source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 #, fuzzy
 #| msgid "Operation"
 msgid "Translation"
 msgstr "Betrieb"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -3200,12 +3300,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3216,12 +3316,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3235,22 +3335,22 @@ msgstr ""
 "automatisch integrieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3259,12 +3359,12 @@ msgstr ""
 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3275,12 +3375,12 @@ msgstr ""
 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3293,12 +3393,12 @@ msgstr ""
 "benutzt, wenn Quellindizes verarbeitet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr "Tree-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3313,12 +3413,18 @@ msgstr ""
 "<literal>Directory</literal>-Ersetzungsvariable definiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: 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 "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 "Der <literal>Tree</literal>-Abschnitt nimmt eine scope-Markierung, die die "
 "<literal>$(DIST)</literal>-Variable setzt und die Wurzel des Baumes "
@@ -3327,7 +3433,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3338,7 +3444,7 @@ msgstr ""
 "Variablen benutzt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, fuzzy, no-wrap
 #| msgid ""
 #| "for i in Sections do \n"
@@ -3355,7 +3461,7 @@ msgstr ""
 "      Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 #, fuzzy
 #| msgid ""
 #| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3369,12 +3475,12 @@ msgstr ""
 "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr "Abschnitte"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3385,12 +3491,12 @@ msgstr ""
 "non-free</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr "Architekturen"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3401,12 +3507,12 @@ msgstr ""
 "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3415,12 +3521,12 @@ msgstr ""
 "Priorität und Adressinformationen des Betreuers."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3429,32 +3535,32 @@ msgstr ""
 "Abschnittsinformationen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr "Setzt die zusätzliche Programm-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr "Setzt die zusätzliche Quell-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr "BinDirectory-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3469,12 +3575,12 @@ msgstr ""
 "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr "Setzt die Packages-Dateiausgabe."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3483,52 +3589,52 @@ msgstr ""
 "<literal>Sources</literal> ist erforderlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr "Setzt die Contents-Dateiausgabe. (optional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr "Setzt die Programm-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr "Setzt die Quell-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr "Setzt die Zwischenspeicherdatenbank."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr "Hängt einen Pfad an alle Ausgabepfade an."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr "Gibt die Dateilistendatei an."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr "Die Programm-Override-Datei "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3543,19 +3649,19 @@ msgstr ""
 "und das letzte Feld ist das Betreuerumsetzungsfeld."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "alt [// oldn]* => neu"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr "neu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3572,12 +3678,12 @@ msgstr ""
 "bedingungslos."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr "Die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3588,12 +3694,12 @@ msgstr ""
 "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr "Die zusätzlich Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3605,12 +3711,12 @@ msgstr ""
 "ist der neue Wert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr "<option>--md5</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -3621,12 +3727,12 @@ msgstr ""
 "ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3636,7 +3742,7 @@ msgstr ""
 "DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3650,12 +3756,12 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3669,12 +3775,12 @@ msgstr ""
 "DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3690,12 +3796,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3706,12 +3812,12 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3720,14 +3826,14 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3747,14 +3853,14 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 #, fuzzy
 #| msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3768,12 +3874,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 #, fuzzy
 #| msgid ""
 #| "This configuration option defaults to \"<literal>true</literal>\" and "
@@ -3795,19 +3901,19 @@ msgstr ""
 "Dateien mit <command>apt-ftparchive</command> zu erstellen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3817,7 +3923,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3847,30 +3953,60 @@ msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
 
 #. 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> "
 "<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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -3913,12 +4049,18 @@ msgstr ""
 "</group> </arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: 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 "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>apt-get</command> ist ein Befehlszeilenwerkzeug zur Handhabung von "
 "Paketen und könnte als »Backend« anderer Werkzeugen betrachtet werden, die "
@@ -3927,12 +4069,12 @@ msgstr ""
 "apt; und &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3956,12 +4098,12 @@ msgstr ""
 "Größe der Pakete nicht im voraus bekannt ist."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3987,12 +4129,12 @@ msgstr ""
 "get</command> die neuen Versionen der verfügbaren Pakete kennt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -4009,12 +4151,12 @@ msgstr ""
 "Installieren von neuen Paketen)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -4038,12 +4180,12 @@ msgstr ""
 "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -4072,7 +4214,7 @@ msgstr ""
 "vom Konfliktauflösungssystem von apt-get getroffen wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -4090,7 +4232,7 @@ msgstr ""
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -4099,7 +4241,7 @@ msgstr ""
 "durchführen und müssen mit Vorsicht gehandhabt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -4120,7 +4262,7 @@ msgstr ""
 "heruntergeladen und installiert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4129,7 +4271,7 @@ msgstr ""
 "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -4149,12 +4291,12 @@ msgstr ""
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4169,12 +4311,12 @@ msgstr ""
 "Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4185,12 +4327,12 @@ msgstr ""
 "Konfigurationsdateien werden mitgelöscht)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -4210,7 +4352,7 @@ msgstr ""
 "wurde, wenn möglich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4226,7 +4368,7 @@ msgstr ""
 "installiert haben oder installieren könnten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4239,7 +4381,7 @@ msgstr ""
 "ist, wird das Quellpaket nicht entpackt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -4255,7 +4397,7 @@ msgstr ""
 "literal>-Option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4266,12 +4408,12 @@ msgstr ""
 "heruntergeladenen Tarballs ähnlich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
@@ -4281,12 +4423,12 @@ msgstr ""
 "erfüllen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4295,7 +4437,7 @@ msgstr ""
 "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4314,12 +4456,12 @@ msgstr ""
 "Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4339,12 +4481,12 @@ msgstr ""
 "sie auf »off« gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -4355,12 +4497,12 @@ msgstr ""
 "nicht mehr benötigt werden, zu entfernen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4369,12 +4511,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4384,12 +4526,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -4431,17 +4573,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4462,12 +4604,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4479,7 +4621,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4499,17 +4641,17 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4520,7 +4662,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4538,7 +4680,7 @@ msgstr ""
 "Warnungen von <literal>apt-get</literal> wissen, was er tut)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4551,22 +4693,22 @@ msgstr ""
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4582,17 +4724,17 @@ msgstr ""
 "Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4602,17 +4744,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4622,22 +4764,22 @@ msgstr ""
 "Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4646,27 +4788,27 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr "Installiert außerdem empfohlene Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr "Keine empfohlenen Pakete installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4680,12 +4822,12 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4699,14 +4841,14 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 #, fuzzy
 #| msgid ""
 #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4726,12 +4868,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4746,12 +4888,12 @@ msgstr ""
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4773,12 +4915,12 @@ msgstr ""
 "Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 #, fuzzy
 #| msgid ""
 #| "Use purge instead of remove for anything that would be removed.  An "
@@ -4798,12 +4940,12 @@ msgstr ""
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4812,12 +4954,12 @@ msgstr ""
 "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4835,17 +4977,17 @@ msgstr ""
 "Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4870,12 +5012,12 @@ msgstr ""
 "auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4889,12 +5031,12 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4903,12 +5045,12 @@ msgstr ""
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4922,12 +5064,12 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4946,22 +5088,22 @@ msgstr ""
 "Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4973,12 +5115,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4987,12 +5129,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -5003,7 +5145,7 @@ msgstr ""
 "<literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -5012,7 +5154,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -5023,7 +5165,7 @@ msgstr ""
 "preferences;, das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -5032,22 +5174,22 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr "ORIGINALAUTOREN"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr "AKTUELLE AUTOREN"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -5426,29 +5568,18 @@ msgstr "<option>--version</option>"
 msgid "Show the program version."
 msgstr "Die Programmversion anzeigen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
-"Statusliste automatisch installierter Pakete. Konfigurationselement: "
-"<literal>Dir::State</literal> setzt den Pfad zur Datei "
-"<filename>extended_states</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -6164,11 +6295,17 @@ msgstr "Default-Release"
 
 #. 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', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 "Standard-Release von dem Pakete installiert werden, wenn mehr als eine "
 "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. "
@@ -6176,12 +6313,12 @@ msgstr ""
 "Siehe auch &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr "Ignore-Hold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6190,12 +6327,12 @@ msgstr ""
 "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr "Clean-Installed"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -6210,12 +6347,12 @@ msgstr ""
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr "Immediate-Configure"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 #, fuzzy
 #| msgid ""
 #| "Defaults to on which will cause APT to install essential and important "
@@ -6314,12 +6451,12 @@ msgstr ""
 "Upgrade-Prozesses arbeiten kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr "Force-LoopBreak"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6337,39 +6474,49 @@ msgstr ""
 "bash oder etwas, was davon abhängt, sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 ""
-"APT benutzt eine Zwischenspeicherdatei mit fester Größe, um die »verfügbar«-"
-"Informationen zu speichern. Dies setzt die Größe dieses Zwischenspeichers "
-"(in Bytes)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr "Build-Essential"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 "Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
 "werde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr "Get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6379,12 +6526,12 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr "Cache"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6394,12 +6541,12 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr "CD-ROM"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6409,17 +6556,53 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr "PDiffs"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6429,7 +6612,7 @@ msgstr ""
 "True."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6440,12 +6623,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr "Queue-Mode"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6461,12 +6644,12 @@ msgstr ""
 "URI-Art geöffnet wird."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr "Retries"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6475,12 +6658,12 @@ msgstr ""
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr "Source-Symlinks"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -6490,12 +6673,12 @@ msgstr ""
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr "http"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6513,7 +6696,7 @@ msgstr ""
 "die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6539,7 +6722,7 @@ msgstr ""
 "unterstützt keine dieser Optionen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6550,7 +6733,7 @@ msgstr ""
 "Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -6570,7 +6753,7 @@ msgstr ""
 "gegen RFC 2068."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6586,7 +6769,7 @@ msgstr ""
 "deaktiviert.)"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -6598,12 +6781,12 @@ msgstr ""
 "bekannten Bezeichner verwendet."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -6618,7 +6801,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6657,12 +6840,12 @@ msgstr ""
 "SslForceVersion</literal> ist die entsprechende per-Host-Option."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr "ftp"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6697,7 +6880,7 @@ msgstr ""
 "entsprechenden URI-Bestandteil genommen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -6714,7 +6897,7 @@ msgstr ""
 "Beispielskonfiguration, um Beispiele zu erhalten)."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6728,7 +6911,7 @@ msgstr ""
 "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6744,18 +6927,18 @@ msgstr ""
 "Server RFC2428 unterstützen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr "cdrom"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6777,12 +6960,12 @@ msgstr ""
 "können per UMount angegeben werden."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr "gpgv"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6793,18 +6976,18 @@ msgstr ""
 "Zusätzliche Parameter werden an gpgv weitergeleitet."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr "CompressionTypes"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6824,19 +7007,19 @@ msgstr ""
 "\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -6867,13 +7050,13 @@ msgstr ""
 "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -6899,7 +7082,7 @@ msgstr ""
 "diesen Typ nur vor die Liste setzen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -6916,12 +7099,12 @@ msgstr ""
 "unterstützen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr "GzipIndexes"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6935,12 +7118,12 @@ msgstr ""
 "False."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr "Sprachen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 #, fuzzy
 #| msgid ""
 #| "The Languages subsection controls which <filename>Translation</filename> "
@@ -6972,13 +7155,13 @@ msgstr ""
 "hier unmögliche Werte einsetzen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 #, fuzzy
 #| msgid ""
 #| "The default list includes \"environment\" and \"en\". "
@@ -7040,7 +7223,7 @@ msgstr ""
 "Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -7050,12 +7233,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr "Verzeichnisse"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -7075,7 +7258,7 @@ msgstr ""
 "filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -7098,7 +7281,7 @@ msgstr ""
 "in <literal>Dir::Cache</literal> enthalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -7113,7 +7296,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -7125,7 +7308,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -7143,7 +7326,7 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -7162,13 +7345,24 @@ msgstr ""
 "var/lib/dpkg/status</filename> gesetzt ist, nach der Statusdatei in "
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -7179,12 +7373,12 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr "Clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -7202,7 +7396,7 @@ msgstr ""
 "führt diese Aktion vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7211,12 +7405,12 @@ msgstr ""
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr "Updateoptions"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7225,12 +7419,12 @@ msgstr ""
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr "PromptAfterUpdate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7239,12 +7433,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr "Wie APT Dpkg aufruft"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7253,7 +7447,7 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -7264,17 +7458,17 @@ msgstr ""
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr "Pre-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr "Post-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7288,12 +7482,12 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr "Pre-Install-Pkgs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7310,7 +7504,7 @@ msgstr ""
 "pro Zeile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7326,12 +7520,12 @@ msgstr ""
 "literal> gegeben wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr "Run-Directory"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7340,12 +7534,12 @@ msgstr ""
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr "Build-options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7355,12 +7549,12 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7386,7 +7580,7 @@ msgstr ""
 "Status 100% stehen, während es aktuell alle Pakete konfiguriert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7400,7 +7594,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -7425,12 +7619,12 @@ msgstr ""
 "wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr "DPkg::NoTriggers"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -7451,12 +7645,12 @@ msgstr ""
 "außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr "PackageManager::Configure"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7485,12 +7679,12 @@ msgstr ""
 "mehr startbar sein könnte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr "DPkg::ConfigurePending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7509,12 +7703,12 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr "DPkg::TriggersPending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7530,12 +7724,12 @@ msgstr ""
 "benötigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr "PackageManager::UnpackAll"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7554,12 +7748,12 @@ msgstr ""
 "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr "OrderList::Score::Immediate"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7577,7 +7771,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -7601,12 +7795,12 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7620,12 +7814,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7643,7 +7837,7 @@ msgstr ""
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7654,7 +7848,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7665,7 +7859,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -7677,7 +7871,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
@@ -7686,17 +7880,17 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -7704,48 +7898,48 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "<literal>Debug::Acquire::ftp</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "<literal>Debug::Acquire::http</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "<literal>Debug::Acquire::https</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "<literal>Debug::Acquire::gpgv</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -7754,12 +7948,12 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "<literal>Debug::aptcdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -7768,23 +7962,23 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "<literal>Debug::BuildDeps</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "<literal>Debug::Hashes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -7793,12 +7987,12 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "<literal>Debug::IdentCDROM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7809,12 +8003,12 @@ msgstr ""
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "<literal>Debug::NoLocking</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -7824,24 +8018,24 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "<literal>Debug::pkgAcquire</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -7850,12 +8044,12 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -7864,12 +8058,12 @@ msgstr ""
 "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -7879,12 +8073,12 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -7892,12 +8086,12 @@ msgstr ""
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr "<literal>Debug::pkgAutoRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -7907,12 +8101,12 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7928,12 +8122,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7965,23 +8159,23 @@ msgstr ""
 "erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "<literal>Debug::pkgInitConfig</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "<literal>Debug::pkgDPkgPM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -7991,12 +8185,12 @@ msgstr ""
 "sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -8005,12 +8199,12 @@ msgstr ""
 "alle während deren Auswertung gefundenen Fehler ausgeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "<literal>Debug::pkgOrderList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -8020,12 +8214,12 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -8033,22 +8227,22 @@ msgstr ""
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "<literal>Debug::pkgPolicy</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr "<literal>Debug::pkgProblemResolver</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -8058,12 +8252,12 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -8075,12 +8269,12 @@ msgstr ""
 "beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "<literal>Debug::sourceList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -8089,7 +8283,7 @@ msgstr ""
 "gelesenen Anbieter ausgeben."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -8098,13 +8292,13 @@ msgstr ""
 "möglichen Optionen zeigen."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr "&file-aptconf;"
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8256,21 +8450,36 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-msgid "priority 100"
+#, fuzzy
+#| msgid "priority 100"
+msgid "priority 1"
 msgstr "Priorität 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+msgid "priority 100"
+msgstr "Priorität 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr "Priorität 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -8279,12 +8488,12 @@ msgstr ""
 "gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr "Priorität 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -8302,18 +8511,25 @@ msgstr ""
 "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: 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 "
-"uninstalled package versions."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen "
 "installierten Paketversionen eine Priorität von 100 und allen nicht "
 "installierten Paketversionen eine Priorität von 500 zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -8323,7 +8539,7 @@ msgstr ""
 "ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8339,12 +8555,12 @@ msgstr ""
 "Downgrading eines Paketes riskant sein kann.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr "Die Version mit der höchsten Priorität installieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8353,7 +8569,7 @@ msgstr ""
 "aktuellste installiert (das ist die mit der höheren Versionsnummer)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8365,7 +8581,7 @@ msgstr ""
 "installierte installiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8381,7 +8597,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8395,7 +8611,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8415,12 +8631,12 @@ msgstr ""
 "hat."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr "Die Auswirkungen von APT-Einstellungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8434,7 +8650,7 @@ msgstr ""
 "allgemeine Gestalt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8450,7 +8666,7 @@ msgstr ""
 "können durch Leerzeichen getrennt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8462,7 +8678,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8477,7 +8693,7 @@ msgstr ""
 "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8488,7 +8704,7 @@ msgstr ""
 "Paketversionen eine hohe Priorität zu, die lokal liegen."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8500,7 +8716,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8509,7 +8725,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -8525,7 +8741,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 #, fuzzy
 #| msgid ""
 #| "A note of caution: the keyword used here is \"<literal>origin</literal>"
@@ -8548,7 +8764,7 @@ msgstr ""
 "wie »Debian« oder »Ximian«."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8559,7 +8775,7 @@ msgstr ""
 "Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8571,22 +8787,31 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: 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>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "
 "gehören, deren Codename »<literal>squeeze</literal>« ist, eine hohe "
 "Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
-#, no-wrap
+#: apt_preferences.5.xml:232
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
@@ -8594,7 +8819,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8605,7 +8830,7 @@ msgstr ""
 "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8617,17 +8842,17 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr "Wie APT Prioritäten interpretiert"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8636,12 +8861,12 @@ msgstr ""
 "des Pakets durchführt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8650,12 +8875,12 @@ msgstr ""
 "Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8665,12 +8890,12 @@ msgstr ""
 "neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8680,12 +8905,12 @@ msgstr ""
 "installierte Version neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8694,17 +8919,17 @@ msgstr ""
 "installierte Version des Pakets gibt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr "verhindert das Installieren der Version"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8715,7 +8940,7 @@ msgstr ""
 "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8729,7 +8954,7 @@ msgstr ""
 "erste dieser Datensätze die Priorität der Paketversion fest."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8738,7 +8963,7 @@ msgstr ""
 "bereits gezeigten Datensätze:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8766,12 +8991,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr "Dann:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8786,7 +9011,7 @@ msgstr ""
 "dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8797,7 +9022,7 @@ msgstr ""
 "sogar wenn diese Versionen zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8811,12 +9036,12 @@ msgstr ""
 "Pakets installiert ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8827,27 +9052,27 @@ msgstr ""
 "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr "die <literal>Package:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr "gibt den Paketnamen an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr "die <literal>Version:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr "gibt die Versionsnummer für das genannte Paket an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8868,12 +9093,12 @@ msgstr ""
 "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8890,24 +9115,33 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr "die <literal>Codename:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: 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: 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 "benennt den Codenamen, zu dem alle Pakete im Verzeichnisbaum gehören. Die "
 "Zeile »Codename: squeeze« gibt zum Beispiel an, dass alle Pakete im "
@@ -8917,13 +9151,14 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "Pin: release a=stable\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8939,7 +9174,7 @@ msgstr ""
 "eine der folgenden Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8951,12 +9186,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr "die <literal>Component:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8974,18 +9209,18 @@ msgstr ""
 "Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr "die <literal>Origin:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8997,18 +9232,18 @@ msgstr ""
 "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr "die <literal>Label:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -9021,22 +9256,34 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: 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 "
 "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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
 "<filename>.../dists/<replaceable>Distributionsname</replaceable></filename> "
@@ -9049,7 +9296,7 @@ msgstr ""
 "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -9075,12 +9322,12 @@ msgstr ""
 "Distribution heruntergeladen wurde."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -9091,12 +9338,12 @@ msgstr ""
 "anfangen. Dieses stellt einen Platz für Kommentare bereit."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr "Stable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9120,7 +9367,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -9135,8 +9382,8 @@ msgstr ""
 "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9148,7 +9395,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 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 "
@@ -9161,13 +9408,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9181,12 +9428,12 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr "Testing oder Unstable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9214,7 +9461,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9231,7 +9478,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 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 "
@@ -9244,13 +9491,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9270,12 +9517,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr "Die Entwicklung eines Codename-Releases verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:600
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9294,9 +9541,9 @@ msgstr "Die Entwicklung eines Codename-Releases verfolgen"
 #| "Pin-Priority: -10\n"
 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -9324,7 +9571,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -9350,12 +9597,18 @@ msgstr ""
 "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: 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 "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
 "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte"
@@ -9363,21 +9616,30 @@ msgstr ""
 "durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: 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, "
 "<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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 "Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets "
 "auf die letzte Version der <literal>sid</literal>-Distribution "
@@ -9389,12 +9651,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9599,10 +9861,14 @@ msgstr "Einige Beispiele:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, no-wrap
+#, 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"
+#| "   "
 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"
+"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"
@@ -9824,17 +10090,22 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. 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/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 "Benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-"
 "Verzeichnis zuzugreifen und nur den stable/contrib-Bereich zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -11505,6 +11776,45 @@ msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
+#~ msgid ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+#~ msgstr ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+
+#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
+#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
+
+#~ msgid ""
+#~ "Status list of auto-installed packages.  Configuration Item: "
+#~ "<literal>Dir::State</literal> sets the path to the "
+#~ "<filename>extended_states</filename> file."
+#~ msgstr ""
+#~ "Statusliste automatisch installierter Pakete. Konfigurationselement: "
+#~ "<literal>Dir::State</literal> setzt den Pfad zur Datei "
+#~ "<filename>extended_states</filename>."
+
+#~ msgid "Cache-Limit"
+#~ msgstr "Cache-Limit"
+
+#~ msgid ""
+#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
+#~ "information. This sets the size of that cache (in bytes)."
+#~ msgstr ""
+#~ "APT benutzt eine Zwischenspeicherdatei mit fester Größe, um die "
+#~ "»verfügbar«-Informationen zu speichern. Dies setzt die Größe dieses "
+#~ "Zwischenspeichers (in Bytes)."
+
+#~ msgid "Pin: release n=squeeze\n"
+#~ msgstr "Pin: release n=squeeze\n"
+
 #~ msgid ""
 #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
 #~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
diff --git a/doc/po/es.po b/doc/po/es.po
index 8d0ef8e7c..cd945219f 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2010-03-02 18:43+0200\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian Spanish l10n <debian-l10n-spanish@lists.debian.org>\n"
@@ -561,22 +561,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -590,7 +574,7 @@ msgstr ""
 ">\n"
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -618,7 +602,7 @@ msgstr ""
 "   <productname>Linux</productname>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -628,7 +612,7 @@ msgstr ""
 "\"> \n"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -644,7 +628,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -664,7 +648,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -684,7 +668,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -702,7 +686,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -714,7 +698,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -732,7 +716,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -748,7 +732,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -774,7 +758,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -794,7 +778,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -818,7 +802,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -838,7 +822,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry>\n"
@@ -874,7 +858,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -902,7 +886,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -929,7 +913,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -945,7 +929,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -961,7 +945,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -977,7 +961,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -993,7 +977,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -1016,7 +1000,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1032,7 +1016,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1048,7 +1032,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1064,7 +1048,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -1082,7 +1066,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1098,7 +1082,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY file-sourceslist \"\n"
@@ -1120,7 +1104,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1143,7 +1127,31 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:375
+#: 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"
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+"     <listitem><para>Ubicaciones de dónde conseguir los paquetes.\n"
+"     Opción de configuración: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1152,7 +1160,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1166,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1181,6 +1189,13 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1265,7 +1280,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -1286,7 +1301,7 @@ msgstr ""
 "genera información interesante a partir de los metadatos del paquete."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1797,8 +1812,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr "Opciones"
 
@@ -1824,7 +1839,7 @@ msgstr ""
 "configuración: <literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1850,12 +1865,12 @@ msgstr ""
 "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1895,17 +1910,91 @@ msgstr ""
 "configuración: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-pre-depends</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+#, fuzzy
+#| msgid "<option>--no-download</option>"
+msgid "<option>--no-depends</option>"
+msgstr "<option>--no-download</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+#, fuzzy
+#| msgid "<option>--install-recommends</option>"
+msgid "<option>--no-recommends</option>"
+msgstr "<option>--install-recommends</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-suggests</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+#, fuzzy
+#| msgid "<option>--no-mount</option>"
+msgid "<option>--no-conflicts</option>"
+msgstr "<option>--no-mount</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-breaks</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-replaces</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-enhances</option>"
+msgstr "<option>--no-act</option>"
+
+#. 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 "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+"Hace que <literal>depends</literal> y <literal>rdepends</literal> sean "
+"recursivos de modo que todos los paquetes mencionados se muestran sólo una "
+"vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1914,17 +2003,17 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1941,17 +2030,17 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1963,17 +2052,17 @@ msgstr ""
 "Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1982,12 +2071,12 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1998,12 +2087,12 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2014,12 +2103,12 @@ msgstr ""
 "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2030,46 +2119,46 @@ msgstr ""
 "Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr "Ficheros"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr "Véase también"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2205,7 +2294,7 @@ msgid "Options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2249,7 +2338,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
@@ -2304,17 +2393,17 @@ msgstr ""
 "pero encontrará todo el contenido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
@@ -2451,7 +2540,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Sólo muestra el contenido del espacio de configuración."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2530,7 +2619,7 @@ msgstr ""
 "<filename>paquete.config.XXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
@@ -2786,14 +2875,25 @@ msgstr ""
 
 #. 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</"
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "Los valores para los campos de metadatos adicionales en el fichero «Release» "
 "se toman de las variables correspondientes en <literal>APT::FTPArchive::"
@@ -2805,12 +2905,12 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2826,12 +2926,12 @@ msgstr ""
 "configuración necesaria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2841,12 +2941,12 @@ msgstr ""
 "necesarios."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr "La configuración de «generate»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2864,7 +2964,7 @@ msgstr ""
 "etiqueta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2872,12 +2972,12 @@ msgstr ""
 "describen a continuación."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr "Sección Dir"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2890,12 +2990,12 @@ msgstr ""
 "secciones posteriores para producir una ruta absoluta."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr "Sección ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2906,32 +3006,32 @@ msgstr ""
 "«dist»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr "Sección OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr "Define la ubicación de los ficheros alternativos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr "Sección CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr "Define la ubicación de los ficheros de la caché."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr "Sección FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2940,12 +3040,12 @@ msgstr ""
 "posteriormente el valor <literal>FileList</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr "Sección Default"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2956,12 +3056,12 @@ msgstr ""
 "sobrescribir estos valores predeterminados con un valor de la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2975,12 +3075,12 @@ msgstr ""
 "compresión es «. gzip»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2989,12 +3089,12 @@ msgstr ""
 "paquete. El valor predeterminado es «.deb»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -3003,12 +3103,12 @@ msgstr ""
 "controla la compresión para los ficheros «Sources»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -3017,12 +3117,12 @@ msgstr ""
 "ficheros de fuentes. El valor predeterminado es «.dsc»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -3031,14 +3131,14 @@ msgstr ""
 "controla la compresión para los ficheros «Contents»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 #, fuzzy
 #| msgid "Contents::Compress"
 msgid "Translation::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 #, fuzzy
 #| msgid ""
 #| "This is similar to <literal>Packages::Compress</literal> except that it "
@@ -3051,12 +3151,12 @@ msgstr ""
 "controla la compresión para los ficheros «Contents»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -3067,12 +3167,12 @@ msgstr ""
 "cada sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -3082,26 +3182,26 @@ msgstr ""
 "sin tener en cuenta la máscara de usuario («umask»)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 #, fuzzy
 #| msgid "Description"
 msgid "LongDescription"
 msgstr "Descripción"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr "Sección TreeDefault"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3112,12 +3212,12 @@ msgstr ""
 "$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -3128,12 +3228,12 @@ msgstr ""
 "que durante varios días todos se regenerarán."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3152,12 +3252,12 @@ msgstr ""
 "unidades usadas son días."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3166,12 +3266,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3180,12 +3280,12 @@ msgstr ""
 "predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3194,12 +3294,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 #, fuzzy
 #| msgid ""
 #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3212,14 +3312,14 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 #, fuzzy
 #| msgid "Operation"
 msgid "Translation"
 msgstr "Operación"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -3227,12 +3327,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3243,12 +3343,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3262,23 +3362,23 @@ msgstr ""
 "esos ficheros de paquete juntos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 "Define el fichero de cabecera a añadir al fichero «Contents» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3287,12 +3387,12 @@ msgstr ""
 "Varias secciones pueden compartir la misma base de datos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3304,12 +3404,12 @@ msgstr ""
 "como prefijo el directorio del archivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3323,12 +3423,12 @@ msgstr ""
 "índices de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr "Sección Tree"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3343,12 +3443,18 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: 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 "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 "La sección <literal>Tree</literal> toma un ámbito de una etiqueta que define "
 "la variable <literal>$(DIST)</literal> y la raíz del árbol (a la ruta se le "
@@ -3356,7 +3462,7 @@ msgstr ""
 "valor como <filename>dists/woody</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3367,7 +3473,7 @@ msgstr ""
 "variables."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, fuzzy, no-wrap
 #| msgid ""
 #| "for i in Sections do \n"
@@ -3384,7 +3490,7 @@ msgstr ""
 "      Generar con DIST=scope SECTION=i ARCH=j\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 #, fuzzy
 #| msgid ""
 #| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3398,12 +3504,12 @@ msgstr ""
 "ftparchive</command> realiza una operación similar a la siguiente:"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr "Secciones"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3414,12 +3520,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr "Arquitecturas"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3430,12 +3536,12 @@ msgstr ""
 "indicar que este árbol tiene un fichero de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3444,12 +3550,12 @@ msgstr ""
 "sección, la prioridad y la dirección del mantenedor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3458,32 +3564,32 @@ msgstr ""
 "la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr "Define el fichero binario alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr "Define el fichero de fuentes alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr "Sección BinDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3498,12 +3604,12 @@ msgstr ""
 "<literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr "Define el fichero «Packages» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3512,52 +3618,52 @@ msgstr ""
 "<literal>Packages</literal> o <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr "Define el fichero «Contents» de salida. (Opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr "Define el fichero binario alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr "Define el fichero de fuentes alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr "Define la base de datos de la caché."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr "Añade una ruta a todas las rutas de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr "Define el fichero de la lista de ficheros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr "El fichero binario alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3572,19 +3678,19 @@ msgstr ""
 "de permutación del mantenedor."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "antigua [// antigua-n]* => nueva"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr "nueva"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3601,12 +3707,12 @@ msgstr ""
 "segunda forma sustituye de forma incondicional el campo del mantenedor."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr "El fichero de fuentes alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3617,12 +3723,12 @@ msgstr ""
 "nombre del paquete fuente, el segundo es la sección a la que se asignará."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr "El fichero alternativo adicional"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3633,12 +3739,12 @@ msgstr ""
 "paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr "<option>--md5</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -3650,12 +3756,12 @@ msgstr ""
 "FTPArchive::MD5</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3664,7 +3770,7 @@ msgstr ""
 "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3678,12 +3784,12 @@ msgstr ""
 "configuración. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3696,12 +3802,12 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3718,12 +3824,12 @@ msgstr ""
 "Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3734,12 +3840,12 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3748,14 +3854,14 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3774,14 +3880,14 @@ msgstr ""
 "configuración: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 #, fuzzy
 #| msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3795,12 +3901,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 #, fuzzy
 #| msgid ""
 #| "This configuration option defaults to \"<literal>true</literal>\" and "
@@ -3823,19 +3929,19 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3844,7 +3950,7 @@ msgstr ""
 "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3875,30 +3981,60 @@ msgstr ""
 
 #. 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> "
 "<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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -3943,12 +4079,18 @@ msgstr ""
 "group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: 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 "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>apt-get</command> es la herramienta para la gestión de paquetes "
 "desde la línea de órdenes, y se puede considerar el sistema de «bajo nivel» "
@@ -3957,12 +4099,12 @@ msgstr ""
 "&synaptic;, &gnome-apt; y &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3986,12 +4128,12 @@ msgstr ""
 "tamaño de los archivos de paquete."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -4016,12 +4158,12 @@ msgstr ""
 "hay nuevas versiones disponibles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -4038,12 +4180,12 @@ msgstr ""
 "paquetes antiguos e instalar las nuevas versiones)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -4066,12 +4208,12 @@ msgstr ""
 "comportamiento para paquetes individuales."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -4099,7 +4241,7 @@ msgstr ""
 "conflictos de apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -4117,7 +4259,7 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -4126,7 +4268,7 @@ msgstr ""
 "anterior de los paquetes y se debe usar con cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -4146,7 +4288,7 @@ msgstr ""
 "instalarán."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4155,7 +4297,7 @@ msgstr ""
 "paquetes individuales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -4175,12 +4317,12 @@ msgstr ""
 "«$», o bien crear una expresión regular más específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4196,12 +4338,12 @@ msgstr ""
 "cuestión será instalado en vez de eliminado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4212,12 +4354,12 @@ msgstr ""
 "también cualquier fichero de configuración)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -4236,7 +4378,7 @@ msgstr ""
 "release</literal>, si es posible."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4252,7 +4394,7 @@ msgstr ""
 "instalada o de la que podría instalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4265,7 +4407,7 @@ msgstr ""
 "desempaquetará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -4280,7 +4422,7 @@ msgstr ""
 "activando implícitamente la opción <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4291,12 +4433,12 @@ msgstr ""
 "tar comprimidos con las fuentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
@@ -4306,12 +4448,12 @@ msgstr ""
 "fuente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4320,7 +4462,7 @@ msgstr ""
 "caché de paquetes y revisa la existencia de dependencias rotas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4339,12 +4481,12 @@ msgstr ""
 "literal> de vez en cuando para liberar algo de espacio en disco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4363,12 +4505,12 @@ msgstr ""
 "desactivada impedirá que se borren los paquetes instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -4379,12 +4521,12 @@ msgstr ""
 "paquete, pero que ya no son necesarios."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4393,12 +4535,12 @@ msgstr ""
 "de configuración: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4407,12 +4549,12 @@ msgstr ""
 "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -4453,17 +4595,17 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4483,12 +4625,12 @@ msgstr ""
 "<literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4500,7 +4642,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4521,17 +4663,17 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4542,7 +4684,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4560,7 +4702,7 @@ msgstr ""
 "avisos de <literal>apt-get</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4574,22 +4716,22 @@ msgstr ""
 "problema (poco probable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4605,17 +4747,17 @@ msgstr ""
 "<literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4624,17 +4766,17 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4643,22 +4785,22 @@ msgstr ""
 "Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4667,27 +4809,27 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr "También instala los paquetes recomendados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr "No instala los paquetes recomendados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4701,12 +4843,12 @@ msgstr ""
 "Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4719,14 +4861,14 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 #, fuzzy
 #| msgid ""
 #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4745,12 +4887,12 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4766,12 +4908,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4793,12 +4935,12 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 #, fuzzy
 #| msgid ""
 #| "Use purge instead of remove for anything that would be removed.  An "
@@ -4819,12 +4961,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4834,12 +4976,12 @@ msgstr ""
 "ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4857,17 +4999,17 @@ msgstr ""
 "<literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4891,12 +5033,12 @@ msgstr ""
 "también la página del manual de &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4910,12 +5052,12 @@ msgstr ""
 "<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4924,12 +5066,12 @@ msgstr ""
 "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4942,12 +5084,12 @@ msgstr ""
 "configuración: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4967,22 +5109,22 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4993,12 +5135,12 @@ msgstr ""
 "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -5007,12 +5149,12 @@ msgstr ""
 "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -5023,7 +5165,7 @@ msgstr ""
 "configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -5032,7 +5174,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -5043,7 +5185,7 @@ msgstr ""
 "preferences;, el Cómo de APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -5052,22 +5194,22 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTORES ORIGINALES"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr "AUTORES ACTUALES"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -5441,29 +5583,18 @@ msgstr "<option>--version</option>"
 msgid "Show the program version."
 msgstr "Muestra la versión del programa."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
-"Lista del estado de los paquetes instalados automáticamente. Opción de "
-"configuración: <literal>Dir::State</literal> define la ruta del fichero "
-"<filename>extended_states</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -6170,11 +6301,17 @@ msgstr "Default-Release"
 
 #. 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', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 "La versión predeterminada de la que se instalarán los paquetes, si hay más "
 "de una versión disponible. Contiene el nombre de la versión, ya sea el "
@@ -6183,12 +6320,12 @@ msgstr ""
 "preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr "Ignore-Hold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6197,12 +6334,12 @@ msgstr ""
 "problemas ignore los paquetes retenidos en la toma de decisiones."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr "Clean-Installed"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -6216,12 +6353,12 @@ msgstr ""
 "mecanismo directo para reinstalarlos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr "Immediate-Configure"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 #, fuzzy
 #| msgid ""
 #| "Defaults to on which will cause APT to install essential and important "
@@ -6316,12 +6453,12 @@ msgstr ""
 "actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr "Force-LoopBreak"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6338,37 +6475,48 @@ msgstr ""
 "libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 ""
-"APT usa un fichero de caché de memoria mapeada de tamaño fijo para almacenar "
-"la información «disponible». Esto limita el tamaño de esa caché (en bytes)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr "Build-Essential"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 "Define qué paquete(s) se consideran dependencias de creación esenciales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr "Get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6377,12 +6525,12 @@ msgstr ""
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr "Cache"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6391,12 +6539,12 @@ msgstr ""
 "la documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr "CDROM"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6405,17 +6553,53 @@ msgstr ""
 "la documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr "El grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr "PDiffs"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6425,7 +6609,7 @@ msgstr ""
 "predeterminada"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6436,12 +6620,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr "Queue-Mode"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6456,12 +6640,12 @@ msgstr ""
 "se abrirá una conexión por cada tipo de URI."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr "Retries"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6470,12 +6654,12 @@ msgstr ""
 "intentar obtener los ficheros fallidos el número de veces proporcionado."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr "Source-Symlinks"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -6485,12 +6669,12 @@ msgstr ""
 "forma predeterminada."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr "http"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6508,7 +6692,7 @@ msgstr ""
 "definir ninguna de las opciones anteriores."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6533,7 +6717,7 @@ msgstr ""
 "grandes. Aviso: Squid 2.0.2 no permite usar ninguna de estas opciones."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6544,7 +6728,7 @@ msgstr ""
 "realizar la conexión y para recibir datos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -6563,7 +6747,7 @@ msgstr ""
 "necesitan esto violan la RFC 2068."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6578,7 +6762,7 @@ msgstr ""
 "implícitamente la descarga simultánea desde varios servidores)."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -6589,12 +6773,12 @@ msgstr ""
 "permiten el acceso para clientes que usan un identificador conocido."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -6609,7 +6793,7 @@ msgstr ""
 "opción <literal>Pipeline-Depth</literal> no se puede usar por ahora."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6646,12 +6830,12 @@ msgstr ""
 "corresponde a la opción por máquina."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr "ftp"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6685,7 +6869,7 @@ msgstr ""
 "URI."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -6701,7 +6885,7 @@ msgstr ""
 "fichero de configuración de muestra para ver algunos ejemplos)."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6715,7 +6899,7 @@ msgstr ""
 "de http debido a su poca eficiencia."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6731,18 +6915,18 @@ msgstr ""
 "compatibles con la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr "cdrom"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"algo\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6764,12 +6948,12 @@ msgstr ""
 "para desmontar usando UMount."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr "gpgv"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6780,18 +6964,18 @@ msgstr ""
 "introducidos a gpgv."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr "CompressionTypes"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6811,19 +6995,19 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -6854,13 +7038,13 @@ msgstr ""
 "lista ya que se añadirá de forma automática."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -6886,7 +7070,7 @@ msgstr ""
 "lista definida, sólo añadirá este tipo  al principio de la lista."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -6901,12 +7085,12 @@ msgstr ""
 "sin comprimir de modo que se permita el uso de réplicas locales."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6915,12 +7099,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr "Languages"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 #, fuzzy
 #| msgid ""
 #| "The Languages subsection controls which <filename>Translation</filename> "
@@ -6951,13 +7135,13 @@ msgstr ""
 "informarse de cuales están disponibles antes de definir valores imposibles."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 #, fuzzy
 #| msgid ""
 #| "The default list includes \"environment\" and \"en\". "
@@ -7018,7 +7202,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -7027,12 +7211,12 @@ msgstr ""
 "paquetes y los gestores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr "Directorios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -7052,7 +7236,7 @@ msgstr ""
 "empiecen con <filename>/</filename> ó <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -7074,7 +7258,7 @@ msgstr ""
 "predeterminado está en <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -7090,7 +7274,7 @@ msgstr ""
 "<envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -7101,7 +7285,7 @@ msgstr ""
 "Al finalizar este proceso carga el fichero de configuración principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -7118,7 +7302,7 @@ msgstr ""
 "literal> especifican la ubicación de sus respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -7138,13 +7322,24 @@ msgstr ""
 "dpkg/status</filename>, entonces el fichero de estado será <filename>/tmp/"
 "staging/var/lib/dpkg/status</filename>."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr "APT con DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -7155,12 +7350,12 @@ msgstr ""
 "encuentran en la sección <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr "Clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -7178,7 +7373,7 @@ msgstr ""
 "descargar los paquetes nuevos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7187,12 +7382,12 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de instalación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr "Updateoptions"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7201,12 +7396,12 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr "PromptAfterUpdate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7216,12 +7411,12 @@ msgstr ""
 "preguntará en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr "Cómo invoca APT a dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7230,7 +7425,7 @@ msgstr ""
 "se encuentran en la sección <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -7241,17 +7436,17 @@ msgstr ""
 "introduce a &dpkg; como un sólo argumento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr "Pre-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr "Post-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7264,12 +7459,12 @@ msgstr ""
 "sh</filename>, y APT finalizará en caso de fallo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr "Pre-Install-Pkgs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7285,7 +7480,7 @@ msgstr ""
 "instalar, uno por línea."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7301,12 +7496,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr "Run-Directory"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7315,12 +7510,12 @@ msgstr ""
 "predeterminado es <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr "Build-options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7330,12 +7525,12 @@ msgstr ""
 "paquetes y a producir todos los binarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7361,7 +7556,7 @@ msgstr ""
 "mientras se están configurando todos los paquetes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7375,7 +7570,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -7399,12 +7594,12 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr "DPkg::NoTriggers"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -7425,12 +7620,12 @@ msgstr ""
 "añadirá esta opción a las llamadas de desempaquetado y borrado."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr "PackageManager::Configure"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7459,12 +7654,12 @@ msgstr ""
 "sistema. "
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr "DPkg::ConfigurePending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7482,12 +7677,12 @@ msgstr ""
 "desactivar esta opción en todas las ejecuciones menos la última."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr "DPkg::TriggersPending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7503,12 +7698,12 @@ msgstr ""
 "necesarios para configurar este paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr "PackageManager::UnpackAll"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7528,12 +7723,12 @@ msgstr ""
 "ser realmente útil."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr "OrderList::Score::Immediate"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7551,7 +7746,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -7576,12 +7771,12 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr "Las opciones «Periodic» y «Archives»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7595,12 +7790,12 @@ msgstr ""
 "documentación de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr "Opciones de depuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7617,7 +7812,7 @@ msgstr ""
 "para un usuario normal, aunque unas cuantas sí son:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7628,7 +7823,7 @@ msgstr ""
 "purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7639,7 +7834,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como un usuario normal."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -7651,7 +7846,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
@@ -7660,19 +7855,19 @@ msgstr ""
 "statfs en los identificadores de los CDROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 "A continuación, se muestra la lista completa de las opciones de depuración "
 "de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -7680,46 +7875,46 @@ msgstr ""
 "<literal>cdrom://</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "<literal>Debug::Acquire::ftp</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "<literal>Debug::Acquire::http</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "<literal>Debug::Acquire::https</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante "
 "HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "<literal>Debug::Acquire::gpgv</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -7728,12 +7923,12 @@ msgstr ""
 "criptográficas mediante <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "<literal>Debug::aptcdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -7742,24 +7937,24 @@ msgstr ""
 "paquetes almacenadas en CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "<literal>Debug::BuildDeps</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Describe el proceso de resolución de dependencias de compilación en &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "<literal>Debug::Hashes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -7768,12 +7963,12 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "<literal>Debug::IdentCDROM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7784,12 +7979,12 @@ msgstr ""
 "identificador de un CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "<literal>Debug::NoLocking</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -7799,24 +7994,24 @@ msgstr ""
 "a la vez."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "<literal>Debug::pkgAcquire</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra los elementos que se añaden o se borran de la cola de descarga "
 "global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -7826,12 +8021,12 @@ msgstr ""
 "ficheros descargados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -7840,12 +8035,12 @@ msgstr ""
 "lista de índices de paquetes, y los errores relacionados con éstos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -7855,12 +8050,12 @@ msgstr ""
 "índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -7868,12 +8063,12 @@ msgstr ""
 "descargas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr "<literal>Debug::pkgAutoRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -7882,12 +8077,12 @@ msgstr ""
 "de los paquetes y con la eliminación de los paquetes sin usar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7902,12 +8097,12 @@ msgstr ""
 "<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7937,24 +8132,24 @@ msgstr ""
 "la sección en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "<literal>Debug::pkgInitConfig</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 "Vuelca la configuración predeterminada a la salida estándar durante al "
 "iniciarse."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "<literal>Debug::pkgDPkgPM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -7963,12 +8158,12 @@ msgstr ""
 "invocó, con los argumentos separados por un espacio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -7977,12 +8172,12 @@ msgstr ""
 "estado y cualquier error encontrado durante el análisis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "<literal>Debug::pkgOrderList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -7991,12 +8186,12 @@ msgstr ""
 "literal> debería entregar los paquetes a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -8004,22 +8199,22 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "<literal>Debug::pkgPolicy</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr "<literal>Debug::pkgProblemResolver</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -8028,12 +8223,12 @@ msgstr ""
 "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -8044,12 +8239,12 @@ msgstr ""
 "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "<literal>Debug::sourceList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -8058,7 +8253,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -8067,13 +8262,13 @@ msgstr ""
 "valores de ejemplo para todas las opciones posibles."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr "&file-aptconf;"
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8219,21 +8414,36 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-msgid "priority 100"
+#, fuzzy
+#| msgid "priority 100"
+msgid "priority 1"
 msgstr "prioridad 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+msgid "priority 100"
+msgstr "prioridad 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr "a la versión instalada (de existir)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr "prioridad 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -8242,12 +8452,12 @@ msgstr ""
 "objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr "prioridad 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -8266,18 +8476,25 @@ msgstr ""
 "Asignar: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: 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 "
-"uninstalled package versions."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 "Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a "
 "todas las versiones de los paquetes instalados y 500 a las versiones no "
 "instaladas de paquetes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -8286,7 +8503,7 @@ msgstr ""
 "determinar qué versión del paquete debe instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8303,12 +8520,12 @@ msgstr ""
 "ser peligroso)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr "Instala la versión de mayor prioridad."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8317,7 +8534,7 @@ msgstr ""
 "(esto es, la que tiene un número de versión mayor)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8328,7 +8545,7 @@ msgstr ""
 "<literal>--reinstall</literal>, se instalará la que no está instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8343,7 +8560,7 @@ msgstr ""
 "command> o <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8357,7 +8574,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8376,12 +8593,12 @@ msgstr ""
 "versión instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr "El efecto de las preferencias sobre APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8394,7 +8611,7 @@ msgstr ""
 "registros pueden tener una de estos dos formatos: el específico o el general."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8410,7 +8627,7 @@ msgstr ""
 "separados por espacios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8422,7 +8639,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8437,7 +8654,7 @@ msgstr ""
 "identificado por su nombre de dominio."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8448,7 +8665,7 @@ msgstr ""
 "prioridad alta a todas las versiones disponibles desde un sitio local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8460,7 +8677,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8469,7 +8686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -8485,7 +8702,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 #, fuzzy
 #| msgid ""
 #| "A note of caution: the keyword used here is \"<literal>origin</literal>"
@@ -8508,7 +8725,7 @@ msgstr ""
 "tales como «Debian» o «Ximian»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8519,7 +8736,7 @@ msgstr ""
 "archivo de paquetes «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8531,22 +8748,31 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: 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>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "El siguiente registro asigna una prioridad alta a todas las versiones de los "
 "paquetes pertenecientes a cualquier distribución que tenga como nombre clave "
 "«<literal>squeeze</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
-#, no-wrap
+#: apt_preferences.5.xml:232
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
@@ -8554,7 +8780,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8566,7 +8792,7 @@ msgstr ""
 "«<literal>3.0</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8578,17 +8804,17 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr "¿Cómo interpreta APT las prioridades?"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8597,12 +8823,12 @@ msgstr ""
 "el sistema."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8611,12 +8837,12 @@ msgstr ""
 "que la versión instalada sea más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8626,12 +8852,12 @@ msgstr ""
 "más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8640,12 +8866,12 @@ msgstr ""
 "perteneciente a otra distribución, o si la versión instalada es más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8653,17 +8879,17 @@ msgstr ""
 "La versión sólo se instala si no hay ninguna versión del paquete instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr "Evita la instalación de la versión."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8674,7 +8900,7 @@ msgstr ""
 "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8688,7 +8914,7 @@ msgstr ""
 "versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8697,7 +8923,7 @@ msgstr ""
 "registros antes mencionados:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8725,12 +8951,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr "Por ello:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8745,7 +8971,7 @@ msgstr ""
 "la versión 5.8*, desactualizando el paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8756,7 +8982,7 @@ msgstr ""
 "versiones, incluso sobre los pertenecientes a la distribución objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8769,12 +8995,12 @@ msgstr ""
 "hay ninguna versión del paquete ya instalado."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinar la versión del paquete y las propiedades de la distribución"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8785,27 +9011,27 @@ msgstr ""
 "describen los paquetes disponibles en cada uno de los sitios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr "La línea <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr "indica el nombre del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr "La línea <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr "indica el número de versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8826,12 +9052,12 @@ msgstr ""
 "de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8849,24 +9075,33 @@ msgstr ""
 "línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr "La línea <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: 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: 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 "indica el nombre de la distribución a la que pertenecen todos los paquetes "
 "del árbol de directorios. Por ejemplo, la línea «Codename: squeeze» "
@@ -8877,13 +9112,14 @@ msgstr ""
 "siguientes líneas en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "Pin: release a=stable\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8899,7 +9135,7 @@ msgstr ""
 "siguientes línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8911,12 +9147,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr "La línea <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8935,18 +9171,18 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr "La línea <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8959,18 +9195,18 @@ msgstr ""
 "mediante la siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr "La línea <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8983,22 +9219,34 @@ msgstr ""
 "siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: 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 "
 "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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 "El fichero <filename>Release</filename> se suele encontrar en el directorio "
 "<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por "
@@ -9011,7 +9259,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -9036,12 +9284,12 @@ msgstr ""
 "la distribución «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Líneas opcionales en el registro de preferencias de APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -9052,12 +9300,12 @@ msgstr ""
 "Útil para comentarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr "Seguir la distribución «stable» (estable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9081,7 +9329,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -9096,8 +9344,8 @@ msgstr ""
 "<literal>Debian</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9109,7 +9357,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 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 "
@@ -9123,13 +9371,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9142,12 +9390,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9175,7 +9423,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9192,7 +9440,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 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 "
@@ -9205,13 +9453,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9230,12 +9478,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr "Seguir la evolución de una publicación por el nombre"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:600
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9254,9 +9502,9 @@ msgstr "Seguir la evolución de una publicación por el nombre"
 #| "Pin-Priority: -10\n"
 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -9284,7 +9532,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -9311,12 +9559,18 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: 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 "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Con un fichero «&sources-list;» adecuado y el fichero de preferencias "
 "mostrado anteriormente, cualquiera de las siguientes órdenes provocará que "
@@ -9324,21 +9578,30 @@ msgstr ""
 "<literal>squeeze</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: 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, "
 "<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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 "La siguiente orden hace que APT actualice un determinado paquete a la última "
 "versión de la distribución <literal>sid</literal>. Más tarde, <command>apt-"
@@ -9349,12 +9612,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9555,10 +9818,14 @@ msgstr "Algunos ejemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, no-wrap
+#, 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"
+#| "   "
 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"
+"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"
@@ -9775,17 +10042,22 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. 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/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 "Usa FTP para acceder al archivo de Debian en «ftp.debian.org», debajo del "
 "directorio «debian», y usa sólo la sección «stable/contrib»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -11416,6 +11688,45 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Ésto usará los archivos del disco previamente obtenidos."
 
+#~ msgid ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+#~ msgstr ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+
+#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
+#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
+
+#~ msgid ""
+#~ "Status list of auto-installed packages.  Configuration Item: "
+#~ "<literal>Dir::State</literal> sets the path to the "
+#~ "<filename>extended_states</filename> file."
+#~ msgstr ""
+#~ "Lista del estado de los paquetes instalados automáticamente. Opción de "
+#~ "configuración: <literal>Dir::State</literal> define la ruta del fichero "
+#~ "<filename>extended_states</filename>."
+
+#~ msgid "Cache-Limit"
+#~ msgstr "Cache-Limit"
+
+#~ msgid ""
+#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
+#~ "information. This sets the size of that cache (in bytes)."
+#~ msgstr ""
+#~ "APT usa un fichero de caché de memoria mapeada de tamaño fijo para "
+#~ "almacenar la información «disponible». Esto limita el tamaño de esa caché "
+#~ "(en bytes)."
+
+#~ msgid "Pin: release n=squeeze\n"
+#~ msgstr "Pin: release n=squeeze\n"
+
 #~ msgid ""
 #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
 #~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index d3aa73c64..e98d0ac1f 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2010-03-23 09:02+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: fr <debian-l10n-french@lists.debian.org>\n"
@@ -537,22 +537,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -566,7 +550,7 @@ msgstr ""
 ">\n"
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -594,7 +578,7 @@ msgstr ""
 "   <productname>Linux</productname>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -604,7 +588,7 @@ msgstr ""
 "\"> \n"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -620,7 +604,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -640,7 +624,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -660,7 +644,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -678,7 +662,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -690,7 +674,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -708,7 +692,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -724,7 +708,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -750,7 +734,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -770,7 +754,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -794,7 +778,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -814,7 +798,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry>\n"
@@ -850,7 +834,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -878,7 +862,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -904,7 +888,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -920,7 +904,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -936,7 +920,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -952,7 +936,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -968,7 +952,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -989,7 +973,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1005,7 +989,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1021,7 +1005,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1037,7 +1021,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -1054,7 +1038,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1070,7 +1054,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -1086,7 +1070,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -1104,7 +1088,31 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:375
+#: 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"
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+"     <listitem><para>Emplacement pour la récupération des paquets.\n"
+"     Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1113,7 +1121,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1131,7 +1139,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1151,6 +1159,13 @@ msgstr ""
 "     traduction est légèrement en retard sur le contenu d'origine.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1233,7 +1248,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -1254,7 +1269,7 @@ msgstr ""
 "desquelles il extrait les informations intéressantes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1767,8 +1782,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr "options"
 
@@ -1794,7 +1809,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1821,12 +1836,12 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1867,17 +1882,92 @@ msgstr ""
 "Élément de configuration : <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-pre-depends</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+#, fuzzy
+#| msgid "<option>--no-download</option>"
+msgid "<option>--no-depends</option>"
+msgstr "<option>--no-download</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+#, fuzzy
+#| msgid "<option>--install-recommends</option>"
+msgid "<option>--no-recommends</option>"
+msgstr "<option>--install-recommends</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-suggests</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+#, fuzzy
+#| msgid "<option>--no-mount</option>"
+msgid "<option>--no-conflicts</option>"
+msgstr "<option>--no-mount</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-breaks</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-replaces</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-enhances</option>"
+msgstr "<option>--no-act</option>"
+
+#. 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 "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+"Avec cette option, <literal>depends</literal> et <literal>rdepends</literal> "
+"sont récursives de manière à n'afficher qu'une seule fois les paquets "
+"mentionnés. Élément de configuration : <literal>APT::Cache::RecurseDepends</"
+"literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1887,17 +1977,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1915,17 +2005,17 @@ msgstr ""
 "<literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1937,17 +2027,17 @@ msgstr ""
 "configuration : <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1957,12 +2047,12 @@ msgstr ""
 "NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1973,12 +2063,12 @@ msgstr ""
 "configuration : <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1990,12 +2080,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2006,46 +2096,46 @@ msgstr ""
 "Élément de configuration : <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr "Voir aussi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2174,7 +2264,7 @@ msgid "Options"
 msgstr "Options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2218,7 +2308,7 @@ msgstr ""
 "<literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
@@ -2275,17 +2365,17 @@ msgstr ""
 "le CD mais tous les paquets seront repérés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
@@ -2420,7 +2510,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Affiche seulement le contenu de l'espace de configuration."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2499,7 +2589,7 @@ msgstr ""
 "<filename>package.config.XXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
@@ -2735,14 +2825,25 @@ msgstr ""
 
 #. 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</"
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "La valeur des autres champs du fichier Release est tirée de la valeur "
 "correspondante dans <literal>APT::FTPArchive::Release</literal>, p. ex. "
@@ -2753,12 +2854,12 @@ msgstr ""
 "<literal>Components</literal>, <literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2772,12 +2873,12 @@ msgstr ""
 "préciser index et répertoires aussi bien que les paramètres requis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2787,12 +2888,12 @@ msgstr ""
 "sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr "Configuration de la commande generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2809,19 +2910,19 @@ msgstr ""
 "arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr "La section Dir"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2834,12 +2935,12 @@ msgstr ""
 "manière à produire un chemin absolu et complet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2850,32 +2951,32 @@ msgstr ""
 "filename> et les noeuds des distributions."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr "Indique l'emplacement des fichiers d'« override »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr "Indique l'emplacement des fichiers de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2884,12 +2985,12 @@ msgstr ""
 "sert de la valeur <literal>FileList</literal> définie plus bas)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr "La section Default"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2900,12 +3001,12 @@ msgstr ""
 "annulées dans d'autres sections (paramètrage par section)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2918,12 +3019,12 @@ msgstr ""
 "Par défaut, c'est la chaîne « . gzip »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2932,12 +3033,12 @@ msgstr ""
 "paquets. Par défaut, c'est « .deb »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2946,12 +3047,12 @@ msgstr ""
 "compressés les fichiers sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2960,12 +3061,12 @@ msgstr ""
 "fichiers sources. Par défaut, c'est « .dsc »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2974,14 +3075,14 @@ msgstr ""
 "compressés les fichiers « Contents »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 #, fuzzy
 #| msgid "Contents::Compress"
 msgid "Translation::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 #, fuzzy
 #| msgid ""
 #| "This is similar to <literal>Packages::Compress</literal> except that it "
@@ -2994,12 +3095,12 @@ msgstr ""
 "compressés les fichiers « Contents »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -3010,12 +3111,12 @@ msgstr ""
 "paramètre <literal>External-Links</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -3025,26 +3126,26 @@ msgstr ""
 "utilisateur (umasq) est ignoré."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 #, fuzzy
 #| msgid "Description"
 msgid "LongDescription"
 msgstr "Description"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr "La section TreeDefault"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3056,12 +3157,12 @@ msgstr ""
 "respective."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -3073,12 +3174,12 @@ msgstr ""
 "soient reconstruits."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3096,12 +3197,12 @@ msgstr ""
 "défaut ce nombre vaut 10, l'unité étant le jour."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3110,12 +3211,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3124,12 +3225,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3138,12 +3239,12 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -3152,14 +3253,14 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 #, fuzzy
 #| msgid "Operation"
 msgid "Translation"
 msgstr "Fonctionnement"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -3167,12 +3268,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3183,12 +3284,12 @@ msgstr ""
 "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3201,22 +3302,22 @@ msgstr ""
 "<command>apt-ftparchive</command> les intègre automatiquement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3225,12 +3326,12 @@ msgstr ""
 "Différentes sections peuvent partager cette base de données."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3241,12 +3342,12 @@ msgstr ""
 "relatifs sont préfixés par le répertoire de l'archive."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3259,12 +3360,12 @@ msgstr ""
 "traiter les index de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr "La section Tree"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3278,12 +3379,18 @@ msgstr ""
 "par la variable de substitution <literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: 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 "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 "La section <literal>Tree</literal> accepte une étiquette de visée (scope "
 "tag) qui détermine la variable <literal>$(DIST)</literal> et la racine de "
@@ -3291,7 +3398,7 @@ msgstr ""
 "C'est par exemple : <filename>dists/woody</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3302,7 +3409,7 @@ msgstr ""
 "trois nouvelles variables suivantes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -3316,7 +3423,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3327,12 +3434,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr "Sections"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3343,12 +3450,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr "Architectures"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3359,12 +3466,12 @@ msgstr ""
 "que l'arborescence est une arborescence de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3373,12 +3480,12 @@ msgstr ""
 "informations sur la section, la priorité et le responsable du paquet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3387,32 +3494,32 @@ msgstr ""
 "informations sur la section."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr "Indique un autre fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr "Indique un autre fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr "La section BinDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3427,12 +3534,12 @@ msgstr ""
 "paramètrage de <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr "Définit le fichier « Packages » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3441,52 +3548,52 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr "Définit le fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr "Définit le fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr "Définit le fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr "Définit la base de données cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr "Ajoute un chemin à tous les chemins créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr "Définit le fichier contenant la liste des fichiers."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr "Le fichier d'« Override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3501,19 +3608,19 @@ msgstr ""
 "nom du responsable de paquet."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* =&gt; new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3530,12 +3637,12 @@ msgstr ""
 "deuxième forme remplace inconditionnellement le champ."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr "Le fichier d'« Override » pour les sources"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3546,12 +3653,12 @@ msgstr ""
 "sa section."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr "Le fichier supplémentaire d'« Override »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3563,12 +3670,12 @@ msgstr ""
 "ligne est la nouvelle valeur."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr "<option>--md5</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -3580,12 +3687,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3595,7 +3702,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3610,12 +3717,12 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3629,12 +3736,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3650,12 +3757,12 @@ msgstr ""
 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3666,12 +3773,12 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3680,12 +3787,12 @@ msgstr ""
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3699,12 +3806,12 @@ msgstr ""
 "<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3727,12 +3834,12 @@ msgstr ""
 "survenir et l'ensemble de ces contrôles devient inutile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 #, fuzzy
 #| msgid ""
 #| "This configuration option defaults to \"<literal>true</literal>\" and "
@@ -3754,19 +3861,19 @@ msgstr ""
 "pas possible de créer ces fichiers avec <command>apt-ftparchive</command>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3775,7 +3882,7 @@ msgstr ""
 "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3806,30 +3913,60 @@ msgstr ""
 
 #. 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> "
 "<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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -3870,12 +4007,18 @@ msgstr ""
 "group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: 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 "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>Apt-get</command> est le programme en ligne de commande pour la "
 "gestion des paquets. Il peut être considéré comme l'outil de base pour les "
@@ -3883,12 +4026,12 @@ msgstr ""
 "existent, comme dselect, aptitude, synaptic, gnome-apt ou wajig."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3913,12 +4056,12 @@ msgstr ""
 "ne peut être connue à l'avance."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3944,12 +4087,12 @@ msgstr ""
 "l'existence de nouvelles versions des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3967,12 +4110,12 @@ msgstr ""
 "installation de nouveaux paquets)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3995,12 +4138,12 @@ msgstr ""
 "un mécanisme de remplacement des paramètres généraux pour certains paquets."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -4028,7 +4171,7 @@ msgstr ""
 "des conflits d'apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -4045,7 +4188,7 @@ msgstr ""
 "unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -4055,7 +4198,7 @@ msgstr ""
 "avec précaution."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -4075,7 +4218,7 @@ msgstr ""
 "décrit plus haut) sera récupérée et installée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4084,7 +4227,7 @@ msgstr ""
 "l'installation des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -4105,12 +4248,12 @@ msgstr ""
 "d'utiliser une expression plus précise."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4126,12 +4269,12 @@ msgstr ""
 "d'être supprimé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4142,12 +4285,12 @@ msgstr ""
 "de configuration sont également effacés)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -4167,7 +4310,7 @@ msgstr ""
 "respect the default release\"\"\" me paraît douteux."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4183,7 +4326,7 @@ msgstr ""
 "installé ou que vous voulez installer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4195,7 +4338,7 @@ msgstr ""
 "download-only</option> est spécifié, le source n'est pas décompacté."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -4210,7 +4353,7 @@ msgstr ""
 "Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4221,12 +4364,12 @@ msgstr ""
 "sont semblables à des sources téléchargées sous forme d'archives tar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
@@ -4236,12 +4379,12 @@ msgstr ""
 "paquet source."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4250,7 +4393,7 @@ msgstr ""
 "jour le cache des paquets et cherche les dépendances défectueuses."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4269,12 +4412,12 @@ msgstr ""
 "temps en temps si l'on veut libérer de l'espace disque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4293,12 +4436,12 @@ msgstr ""
 "installés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -4309,12 +4452,12 @@ msgstr ""
 "ne sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4323,12 +4466,12 @@ msgstr ""
 "Élément de configuration : <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4338,12 +4481,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4371,17 +4514,17 @@ msgstr ""
 "configuration : <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4401,12 +4544,12 @@ msgstr ""
 "<literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4418,7 +4561,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4440,17 +4583,17 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4461,7 +4604,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4480,7 +4623,7 @@ msgstr ""
 "utile qu'<literal>apt-get</literal> envoie de telles notifications)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4493,22 +4636,22 @@ msgstr ""
 "que les dommages n'ont aucune conséquence (rare)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4524,17 +4667,17 @@ msgstr ""
 "configuration : <literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4544,17 +4687,17 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4563,22 +4706,22 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4587,27 +4730,27 @@ msgstr ""
 "configuration : <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr "Installer également les paquets recommandés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr "Ne pas installer les paquets recommandés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4621,12 +4764,12 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4639,14 +4782,14 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 #, fuzzy
 #| msgid ""
 #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4665,12 +4808,12 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4686,12 +4829,12 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4713,12 +4856,12 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4732,12 +4875,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4746,12 +4889,12 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4769,17 +4912,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4801,12 +4944,12 @@ msgstr ""
 "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4820,12 +4963,12 @@ msgstr ""
 "Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4835,12 +4978,12 @@ msgstr ""
 "Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4853,12 +4996,12 @@ msgstr ""
 "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4878,22 +5021,22 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4905,12 +5048,12 @@ msgstr ""
 "literal>, "
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4920,12 +5063,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4937,7 +5080,7 @@ msgstr ""
 "AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4946,7 +5089,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4957,7 +5100,7 @@ msgstr ""
 "« HOWTO » d'APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4966,22 +5109,22 @@ msgstr ""
 "décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTEURS D'ORIGINE"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr "AUTEURS ACTUELS"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -5352,29 +5495,18 @@ msgstr "<option>--version</option>"
 msgid "Show the program version."
 msgstr "Affiche la version du programme."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
-"États des paquets automatiquement installés. L'élément de configuration "
-"<literal>Dir::State</literal> définit le chemin d'accès au fichier "
-"<filename>extended_states</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -6094,11 +6226,17 @@ msgstr "Default-Release"
 
 #. 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', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 "Indique la distribution à utiliser par défaut lors de l'installation d'un "
 "paquet si plusieurs versions sont disponibles. La valeur peut être un nom de "
@@ -6106,12 +6244,12 @@ msgstr ""
 "« lenny », « squeeze », « 4.0 », « 5.0* ». Voir aussi &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr "Ignore-Hold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6121,12 +6259,12 @@ msgstr ""
 "décision."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr "Clean-Installed"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -6140,12 +6278,12 @@ msgstr ""
 "direct pour les réinstaller."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr "Immediate-Configure"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -6209,12 +6347,12 @@ msgstr ""
 "utilisée afin qu'il soit étudié et corrigé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr "Force-LoopBreak"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6232,39 +6370,49 @@ msgstr ""
 "les paquets dont ces paquets dépendent."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 ""
-"APT utilise un fichier de cache chargé en mémoire avec mmap pour ranger les "
-"informations sur les paquets disponibles. Cette option fixe la taille "
-"mémoire allouée (en octets) pour le chargement de ce cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr "Build-Essential"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 "Cette option définit les paquets qui sont considérés comme faisant partie "
 "des dépendances essentielles pour la construction de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr "Get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6274,12 +6422,12 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr "Cache"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6289,12 +6437,12 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr "CDROM"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6304,17 +6452,53 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr "Le groupe Acquire"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr "PDiffs"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6324,7 +6508,7 @@ msgstr ""
 "télécharger entièrement. Par défaut à « true »."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6343,12 +6527,12 @@ msgstr ""
 "fichiers de différences."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr "Queue-Mode"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6364,12 +6548,12 @@ msgstr ""
 "initiée."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr "Retries"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6379,12 +6563,12 @@ msgstr ""
 "échoué."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr "Source-Symlinks"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -6394,12 +6578,12 @@ msgstr ""
 "archives de sources au lieu de les copier.  Par défaut à « true »."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr "http"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6419,7 +6603,7 @@ msgstr ""
 "options de mandataire HTTP."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6444,7 +6628,7 @@ msgstr ""
 "en compte aucune de ces options."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6455,7 +6639,7 @@ msgstr ""
 "données."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -6475,7 +6659,7 @@ msgstr ""
 "cette option ne respectent pas la RFC 2068."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6490,7 +6674,7 @@ msgstr ""
 "implicitement le téléchargement simultané depuis plusieurs serveurs."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -6502,12 +6686,12 @@ msgstr ""
 "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -6523,7 +6707,7 @@ msgstr ""
 "encore gérée."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6555,12 +6739,12 @@ msgstr ""
 "ou 'SSLv3'."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr "ftp"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6595,7 +6779,7 @@ msgstr ""
 "correspond à l'élément respectif de l'URI."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -6612,7 +6796,7 @@ msgstr ""
 "modèle de fichier de configuration)."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6627,7 +6811,7 @@ msgstr ""
 "efficacité de cette méthode."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6643,18 +6827,18 @@ msgstr ""
 "des serveurs FTP ne suivent pas la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr "cdrom"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6676,12 +6860,12 @@ msgstr ""
 "spécifiées en utilisant <literal>UMount</literal>."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr "gpgv"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6692,18 +6876,18 @@ msgstr ""
 "supplémentaires passées à gpgv."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr "CompressionTypes"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6723,19 +6907,19 @@ msgstr ""
 "type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -6766,13 +6950,13 @@ msgstr ""
 "<literal>bz2</literal> à liste car il sera ajouté automatiquement."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -6798,7 +6982,7 @@ msgstr ""
 "elle sera simplement préfixée avec l'option en question."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -6814,12 +6998,12 @@ msgstr ""
 "non compressés afin de gérer des miroirs locaux."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6828,12 +7012,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr "Langues"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -6855,13 +7039,13 @@ msgstr ""
 "sur ce qui est disponible avant d'établir des réglages impossibles."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6903,7 +7087,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6913,12 +7097,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr "Les répertoires"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -6938,7 +7122,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6961,7 +7145,7 @@ msgstr ""
 "Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6976,7 +7160,7 @@ msgstr ""
 "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -6987,7 +7171,7 @@ msgstr ""
 "configuration est chargé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -7005,7 +7189,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -7026,13 +7210,24 @@ msgstr ""
 "dpkg/status</filename> alors ce fichier sera cherché dans <filename>/tmp/"
 "staging/var/lib/dpkg/status</filename>."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -7043,12 +7238,12 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr "Clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -7066,7 +7261,7 @@ msgstr ""
 "supprime avant de récupérer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7075,12 +7270,12 @@ msgstr ""
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr "UpdateOptions"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7089,12 +7284,12 @@ msgstr ""
 "&apt-get; lors de la phase de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr "PromptAfterUpdate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7104,12 +7299,12 @@ msgstr ""
 "d'erreur que l'on propose à l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr "Méthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7118,7 +7313,7 @@ msgstr ""
 "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -7129,17 +7324,17 @@ msgstr ""
 "est passé comme un seul paramètre à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr "Pre-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr "Post-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7152,12 +7347,12 @@ msgstr ""
 "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr "Pre-Install-Pkgs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7173,7 +7368,7 @@ msgstr ""
 "qu'il va installer, à raison d'un par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7189,12 +7384,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr "Run-Directory"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7203,12 +7398,12 @@ msgstr ""
 "le répertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr "Build-options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7218,14 +7413,14 @@ msgstr ""
 "créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 "utilisation des actions différées (« triggers ») de dpkg (et options "
 "associées)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7252,7 +7447,7 @@ msgstr ""
 "configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7266,7 +7461,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -7290,12 +7485,12 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr "DPkg::NoTriggers"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -7317,12 +7512,12 @@ msgstr ""
 "options « unpack » et « remove »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr "PackageManager::Configure"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7350,12 +7545,12 @@ msgstr ""
 "configuré et donc éventuellement non amorçable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr "DPkg::ConfigurePending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7374,12 +7569,12 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr "DPkg::TriggersPending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7397,12 +7592,12 @@ msgstr ""
 "celles concernant le paquet en cours de traitement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr "PackageManager::UnpackAll"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7427,12 +7622,12 @@ msgstr ""
 "traduction n'est pas exclu...)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr "OrderList::Score::Immediate"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7450,7 +7645,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -7476,12 +7671,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr "Options « Periodic » et « Archive »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7493,12 +7688,12 @@ msgstr ""
 "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr "Les options de débogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7516,7 +7711,7 @@ msgstr ""
 "peuvent tout de même être utiles :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7527,7 +7722,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7539,7 +7734,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -7551,7 +7746,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
@@ -7560,17 +7755,17 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr "Liste complète des options de débogage de APT :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -7578,44 +7773,44 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "<literal>Debug::Acquire::ftp</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "<literal>Debug::Acquire::http</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "<literal>Debug::Acquire::https</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "Print information related to downloading packages using HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "<literal>Debug::Acquire::gpgv</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -7624,12 +7819,12 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "<literal>Debug::aptcdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -7638,24 +7833,24 @@ msgstr ""
 "stockées sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "<literal>Debug::BuildDeps</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Décrit le processus de résolution des dépendances pour la construction de "
 "paquets source ( « build-dependencies » ) par &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "<literal>Debug::Hashes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -7664,12 +7859,12 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "<literal>Debug::IdentCDROM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7680,12 +7875,12 @@ msgstr ""
 "utilisés sur le système de fichier du CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "<literal>Debug::NoLocking</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -7695,24 +7890,24 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "<literal>Debug::pkgAcquire</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Trace les ajouts et suppressions d'éléments de la queue globale de "
 "téléchargement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -7722,12 +7917,12 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -7737,12 +7932,12 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -7752,12 +7947,12 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -7765,12 +7960,12 @@ msgstr ""
 "effectivement des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr "<literal>Debug::pkgAutoRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -7779,12 +7974,12 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7799,12 +7994,12 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7839,24 +8034,24 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "<literal>Debug::pkgInitConfig</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 "Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
 "standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "<literal>Debug::pkgDPkgPM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -7865,12 +8060,12 @@ msgstr ""
 "paramètres sont séparés par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -7880,12 +8075,12 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "<literal>Debug::pkgOrderList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -7894,33 +8089,33 @@ msgstr ""
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "<literal>Debug::pkgPolicy</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr "<literal>Debug::pkgProblemResolver</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -7929,12 +8124,12 @@ msgstr ""
 "concerne que les cas où un problème de dépendances complexe se présente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -7945,12 +8140,12 @@ msgstr ""
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "<literal>Debug::sourceList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -7959,7 +8154,7 @@ msgstr ""
 "list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -7968,13 +8163,13 @@ msgstr ""
 "exemples pour toutes les options existantes."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr "&file-aptconf;"
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8128,21 +8323,36 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-msgid "priority 100"
+#, fuzzy
+#| msgid "priority 100"
+msgid "priority 1"
 msgstr "une priorité égale à 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+msgid "priority 100"
+msgstr "une priorité égale à 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr "est affectée à la version déjà installée (si elle existe)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr "une priorité égale à 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -8151,12 +8361,12 @@ msgstr ""
 "pas à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr "une priorité égale à 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -8175,18 +8385,25 @@ msgstr ""
 "type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: 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 "
-"uninstalled package versions."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 "Quand aucune distribution par défaut n'a été indiquée, APT affecte "
 "simplement une priorité égale à 100 à toute version installée d'un paquet et "
 "une priorité égale à 500 à tout version non installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -8195,7 +8412,7 @@ msgstr ""
 "qu'il faut installer (par ordre de priorité) :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8211,12 +8428,12 @@ msgstr ""
 "arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr "Installer la version qui possède la priorité la plus haute."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8225,7 +8442,7 @@ msgstr ""
 "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8237,7 +8454,7 @@ msgstr ""
 "qui n'est pas installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8252,7 +8469,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get dist-upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8265,7 +8482,7 @@ msgstr ""
 "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8284,12 +8501,12 @@ msgstr ""
 "priorité que celle de la version installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr "Conséquences des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8302,7 +8519,7 @@ msgstr ""
 "formes, une forme particulière et une forme générale."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8317,7 +8534,7 @@ msgstr ""
 "dont le numéro de version commence par <literal>5.8</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8329,7 +8546,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8344,7 +8561,7 @@ msgstr ""
 "un nom complètement qualifié."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8355,7 +8572,7 @@ msgstr ""
 "priorité haute à toutes les versions disponibles dans le site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8367,7 +8584,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8376,7 +8593,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -8392,7 +8609,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 #, fuzzy
 #| msgid ""
 #| "A note of caution: the keyword used here is \"<literal>origin</literal>"
@@ -8414,7 +8631,7 @@ msgstr ""
 "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8425,7 +8642,7 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8437,22 +8654,31 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: 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>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "L'entrée suivante affecte une priorité basse à toutes les versions d'un "
 "paquet appartenant à toute distribution dont le nom d'« Archive » est "
 "<literal>squeeze</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
-#, no-wrap
+#: apt_preferences.5.xml:232
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
@@ -8460,7 +8686,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8472,7 +8698,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8484,17 +8710,17 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr "Méthode d'interprétation des priorités par APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8503,12 +8729,12 @@ msgstr ""
 "retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8518,12 +8744,12 @@ msgstr ""
 "plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8532,12 +8758,12 @@ msgstr ""
 "distribution par défaut ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8546,29 +8772,29 @@ msgstr ""
 "autre distribution ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr "la version sera installée si aucune version du paquet n'est installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr "cette priorité empêche l'installation de la version."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8579,7 +8805,7 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8593,7 +8819,7 @@ msgstr ""
 "trouvée détermine la priorité."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8602,7 +8828,7 @@ msgstr ""
 "entrées décrites ci-dessous :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8630,12 +8856,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr "Alors :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8649,7 +8875,7 @@ msgstr ""
 "installée est une version 5.9*, il y aura un retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8660,7 +8886,7 @@ msgstr ""
 "appartenant à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8673,13 +8899,13 @@ msgstr ""
 "paquet n'est déjà installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 "Détermination de la version des paquets et des propriétés des distributions"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8690,27 +8916,27 @@ msgstr ""
 "décrivent les paquets disponibles à cet endroit."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr "la ligne <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr "donne le nom du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr "la ligne <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr "donne le numéro de version du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8731,12 +8957,12 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8753,24 +8979,33 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr "la ligne <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: 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: 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 "nomme l'archive à laquelle appartiennent tous les paquets situés dans les "
 "répertoires. Par exemple, la ligne <literal>Archive: stable</literal> "
@@ -8780,13 +9015,14 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "Pin: release a=stable\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8802,7 +9038,7 @@ msgstr ""
 "préférences demanderait ces lignes :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8814,12 +9050,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr "La ligne <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8837,18 +9073,18 @@ msgstr ""
 "fichier des préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr "La ligne <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8861,18 +9097,18 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr "La ligne <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8885,22 +9121,34 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: 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 "
 "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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 "Le fichier <filename>Release</filename> se trouve normalement dans le "
 "répertoire <filename>.../dists/<replaceable>dist-name</replaceable></"
@@ -8913,7 +9161,7 @@ msgstr ""
 "déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8938,12 +9186,12 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Lignes facultatives dans le fichier des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8954,12 +9202,12 @@ msgstr ""
 "commentaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr "Méthode pour suivre Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8983,7 +9231,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8998,8 +9246,8 @@ msgstr ""
 "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9011,7 +9259,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 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 "
@@ -9024,13 +9272,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9043,12 +9291,12 @@ msgstr ""
 "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr "Méthode pour suivre Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9076,7 +9324,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9093,7 +9341,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 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 "
@@ -9106,13 +9354,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9131,12 +9379,12 @@ msgstr ""
 "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr "Suivre l'évolution d'une version par son nom de code"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:600
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9155,9 +9403,9 @@ msgstr "Suivre l'évolution d'une version par son nom de code"
 #| "Pin-Priority: -10\n"
 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -9185,7 +9433,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -9209,12 +9457,18 @@ msgstr ""
 "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: 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 "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Avec le fichier des préférences ci-dessus et un fichier &sources-list; "
 "adéquat, les commandes suivantes utiliseront les versions les plus récentes "
@@ -9222,21 +9476,30 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: 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, "
 "<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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 "La commande suivante utilisera la version la plus récente de la distribution "
 "<literal>sid</literal> pour mettre à niveau le paquet spécifié ; Par la "
@@ -9247,12 +9510,12 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9453,10 +9716,14 @@ msgstr "Exemples :"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, no-wrap
+#, 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"
+#| "   "
 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"
+"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"
@@ -9665,17 +9932,22 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. 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/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 "Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le "
 "répertoire debian, et n'utiliser que la section stable/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -11304,6 +11576,45 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+#~ msgstr ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+
+#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
+#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
+
+#~ msgid ""
+#~ "Status list of auto-installed packages.  Configuration Item: "
+#~ "<literal>Dir::State</literal> sets the path to the "
+#~ "<filename>extended_states</filename> file."
+#~ msgstr ""
+#~ "États des paquets automatiquement installés. L'élément de configuration "
+#~ "<literal>Dir::State</literal> définit le chemin d'accès au fichier "
+#~ "<filename>extended_states</filename>."
+
+#~ msgid "Cache-Limit"
+#~ msgstr "Cache-Limit"
+
+#~ msgid ""
+#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
+#~ "information. This sets the size of that cache (in bytes)."
+#~ msgstr ""
+#~ "APT utilise un fichier de cache chargé en mémoire avec mmap pour ranger "
+#~ "les informations sur les paquets disponibles. Cette option fixe la taille "
+#~ "mémoire allouée (en octets) pour le chargement de ce cache."
+
+#~ msgid "Pin: release n=squeeze\n"
+#~ msgstr "Pin: release n=squeeze\n"
+
 #~ msgid ""
 #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
 #~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
diff --git a/doc/po/it.po b/doc/po/it.po
index 673cf8436..d204b64e6 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -406,17 +406,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -425,7 +414,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -442,7 +431,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -450,7 +439,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -461,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -474,7 +463,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -487,7 +476,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -499,7 +488,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -508,7 +497,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -520,7 +509,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -531,7 +520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -547,7 +536,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -560,7 +549,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -575,7 +564,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -588,7 +577,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -605,7 +594,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -622,7 +611,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -638,7 +627,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -649,7 +638,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -660,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -671,7 +660,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -682,7 +671,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -697,7 +686,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -708,7 +697,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -719,7 +708,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -730,7 +719,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -742,7 +731,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -753,7 +742,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -764,7 +753,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -776,7 +765,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:375
+#: apt.ent:373
+#, no-wrap
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -785,7 +787,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -799,7 +801,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -814,6 +816,13 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -876,7 +885,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -893,7 +902,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1267,8 +1276,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr ""
 
@@ -1291,7 +1300,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr ""
@@ -1312,12 +1321,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1349,34 +1358,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+msgid "<option>--no-pre-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+msgid "<option>--no-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+msgid "<option>--no-recommends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+msgid "<option>--no-suggests</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+msgid "<option>--no-conflicts</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+msgid "<option>--no-breaks</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+msgid "<option>--no-replaces</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+msgid "<option>--no-enhances</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:320
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be twicked with these flags which will omit "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1387,17 +1446,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1405,29 +1464,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1435,12 +1494,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1448,12 +1507,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1461,46 +1520,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1599,7 +1658,7 @@ msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1635,7 +1694,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr ""
 
@@ -1680,17 +1739,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr ""
 
@@ -1794,7 +1853,7 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr ""
@@ -1855,7 +1914,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr ""
 
@@ -2030,18 +2089,19 @@ msgid ""
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 #, fuzzy
 msgid "generate"
 msgstr "Descrizione generale"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2051,24 +2111,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2079,18 +2139,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2099,12 +2159,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2112,44 +2172,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2157,12 +2217,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2171,72 +2231,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 msgid "Translation::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2244,36 +2304,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 msgid "LongDescription"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2281,12 +2341,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2294,12 +2354,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2310,60 +2370,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 msgid "Translation"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2371,12 +2431,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2384,12 +2444,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2398,34 +2458,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2433,12 +2493,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2447,12 +2507,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2462,16 +2522,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:364
 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>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2479,7 +2539,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2489,7 +2549,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2497,12 +2557,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2510,12 +2570,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2523,56 +2583,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2582,64 +2642,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -2649,19 +2709,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2672,12 +2732,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2685,12 +2745,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -2698,12 +2758,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -2711,19 +2771,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2732,12 +2792,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2746,12 +2806,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2761,12 +2821,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2774,24 +2834,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2800,12 +2860,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2819,12 +2879,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2834,26 +2894,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2884,26 +2944,21 @@ 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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -2915,22 +2970,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:112
 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;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 #, fuzzy
 msgid "update"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -2944,13 +2999,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 #, fuzzy
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -2965,13 +3020,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 #, fuzzy
 msgid "dselect-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -2982,13 +3037,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 #, fuzzy
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3002,13 +3057,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 #, fuzzy
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3024,7 +3079,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3035,14 +3090,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3054,14 +3109,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3073,12 +3128,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3088,12 +3143,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3101,12 +3156,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3118,7 +3173,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3128,7 +3183,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -3137,7 +3192,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3147,7 +3202,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3155,31 +3210,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3191,12 +3246,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3208,12 +3263,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -3221,36 +3276,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -3266,17 +3321,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3288,12 +3343,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -3301,7 +3356,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3313,17 +3368,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -3331,7 +3386,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -3342,7 +3397,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3351,22 +3406,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -3376,83 +3431,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -3461,12 +3516,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -3475,12 +3530,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 msgid "<option>--only-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -3489,12 +3544,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -3504,12 +3559,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -3522,12 +3577,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3536,24 +3591,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -3564,17 +3619,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -3588,12 +3643,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3602,24 +3657,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3628,12 +3683,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -3645,22 +3700,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3668,24 +3723,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -3693,14 +3748,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3708,29 +3763,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr ""
 
@@ -4049,26 +4104,18 @@ msgstr ""
 msgid "Show the program version."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -4587,29 +4634,29 @@ msgstr ""
 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;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -4618,12 +4665,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -4656,12 +4703,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4672,82 +4719,131 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -4758,12 +4854,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4773,36 +4869,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4813,7 +4909,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4827,7 +4923,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -4835,7 +4931,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -4847,7 +4943,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4857,7 +4953,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4865,12 +4961,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -4880,7 +4976,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4901,12 +4997,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4925,7 +5021,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -4935,7 +5031,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -4944,7 +5040,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4954,18 +5050,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4978,12 +5074,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -4991,18 +5087,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -5014,19 +5110,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -5043,13 +5139,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -5064,7 +5160,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -5074,12 +5170,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -5088,12 +5184,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -5106,13 +5202,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -5135,19 +5231,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -5159,7 +5255,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -5172,7 +5268,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5182,7 +5278,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -5190,7 +5286,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -5201,7 +5297,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5213,14 +5309,25 @@ msgid ""
 "filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 #, fuzzy
 msgid "APT in DSelect"
 msgstr "DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5228,12 +5335,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -5244,50 +5351,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -5295,17 +5402,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5314,12 +5421,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5329,7 +5436,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -5339,36 +5446,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5383,7 +5490,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -5393,7 +5500,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -5407,12 +5514,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -5424,12 +5531,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -5445,12 +5552,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -5461,12 +5568,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5476,12 +5583,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5493,12 +5600,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5510,7 +5617,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -5524,12 +5631,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -5538,12 +5645,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5554,7 +5661,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5562,7 +5669,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5570,7 +5677,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5580,111 +5687,111 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5692,93 +5799,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5788,12 +5895,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5810,91 +5917,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5902,32 +6009,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
@@ -6040,33 +6147,46 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-msgid "priority 100"
+msgid "priority 1"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+msgid "priority 100"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -6080,22 +6200,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:123
 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."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6105,19 +6227,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -6125,7 +6247,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -6135,7 +6257,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -6144,7 +6266,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -6156,12 +6278,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -6170,7 +6292,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -6180,7 +6302,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6189,7 +6311,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -6199,7 +6321,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -6207,7 +6329,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6216,7 +6338,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -6225,7 +6347,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6234,7 +6356,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -6244,7 +6366,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -6252,7 +6374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6261,24 +6383,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:228
 msgid ""
 "The following record assigns a high priority to all package versions "
-"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:232
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6286,7 +6408,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6295,82 +6417,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6378,7 +6500,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6387,14 +6509,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6411,12 +6533,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6426,7 +6548,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6434,7 +6556,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6443,12 +6565,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6456,27 +6578,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6489,12 +6611,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6505,34 +6627,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:392
 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:401
 #, no-wrap
-msgid "Pin: release n=squeeze\n"
+msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -6542,7 +6665,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6551,12 +6674,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6567,18 +6690,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6587,18 +6710,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6607,26 +6730,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:363
 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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6641,12 +6765,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6654,12 +6778,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6674,7 +6798,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6684,8 +6808,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6694,7 +6818,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 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 "
@@ -6703,13 +6827,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6718,12 +6842,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6740,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6751,7 +6875,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 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 "
@@ -6760,13 +6884,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6778,18 +6902,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:600
 #, 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -6803,7 +6927,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6818,39 +6942,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:617
 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\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:628
 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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
@@ -6991,8 +7115,8 @@ msgstr ""
 #: sources.list.5.xml:114
 #, 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"
+"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 ""
 
@@ -7154,13 +7278,13 @@ msgstr ""
 #: sources.list.5.xml:208
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 05d476097..11a0d446f 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2009-07-30 22:55+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -574,22 +574,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -603,7 +587,7 @@ msgstr ""
 ">\n"
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!-- Boiler plate docinfo section -->\n"
@@ -637,7 +621,7 @@ msgstr ""
 "   <productname>Linux</productname>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -647,7 +631,7 @@ msgstr ""
 "\"> \n"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -663,7 +647,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -689,7 +673,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY apt-author.moconnor \"\n"
@@ -715,7 +699,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY apt-author.team \"\n"
@@ -738,7 +722,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -750,7 +734,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -768,7 +752,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -784,7 +768,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -810,7 +794,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -830,7 +814,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -854,7 +838,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -874,7 +858,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry>\n"
@@ -910,7 +894,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -937,7 +921,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -963,7 +947,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -974,7 +958,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -985,7 +969,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -997,7 +981,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, fuzzy, no-wrap
 #| msgid "Storage area for package files in transit.  Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)."
 msgid ""
@@ -1010,7 +994,7 @@ msgstr "取得中パッケージファイル格納エリア。設定項目 - <li
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, fuzzy, no-wrap
 #| msgid "Version preferences file.  This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution.  Configuration Item: <literal>Dir::Etc::Preferences</literal>."
 msgid ""
@@ -1026,7 +1010,7 @@ msgid ""
 msgstr "バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元や異なるディストリビューションのバージョンの、どこからパッケージを取得するかを設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>"
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1037,7 +1021,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1048,7 +1032,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1060,7 +1044,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
 msgid ""
@@ -1074,7 +1058,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information in transit.  Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
 msgid ""
@@ -1087,7 +1071,7 @@ msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::Stat
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
 msgid ""
@@ -1100,7 +1084,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information in transit.  Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
 msgid ""
@@ -1112,8 +1096,23 @@ msgid ""
 "\">\n"
 msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
 
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:375
+#: apt.ent:373
+#, fuzzy, no-wrap
+#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr "&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal>"
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1122,7 +1121,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"訳者\">\n"
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1140,7 +1139,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1155,6 +1154,13 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1242,7 +1248,7 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -1265,7 +1271,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1806,8 +1812,8 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr "オプション"
 
@@ -1834,7 +1840,7 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1861,12 +1867,12 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1907,18 +1913,93 @@ msgstr ""
 "Cache::Important</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-pre-depends</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+#, fuzzy
+#| msgid "<option>--no-download</option>"
+msgid "<option>--no-depends</option>"
+msgstr "<option>--no-download</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+#, fuzzy
+#| msgid "<option>--install-recommends</option>"
+msgid "<option>--no-recommends</option>"
+msgstr "<option>--install-recommends</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-suggests</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+#, fuzzy
+#| msgid "<option>--no-mount</option>"
+msgid "<option>--no-conflicts</option>"
+msgstr "<option>--no-mount</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-breaks</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-replaces</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-enhances</option>"
+msgstr "<option>--no-act</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. 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 "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+"<literal>depends</literal> や <literal>rdepends</literal> で、指定した全パッ"
+"ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
+"RecurseDepends</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1927,18 +2008,18 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1954,18 +2035,18 @@ msgstr ""
 "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1977,18 +2058,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1997,13 +2078,13 @@ msgstr ""
 "Cache::NamesOnly</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2013,13 +2094,13 @@ msgstr ""
 "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2030,13 +2111,13 @@ msgstr ""
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2048,51 +2129,51 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr "ファイル"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr "関連項目"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr "診断メッセージ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2235,7 +2316,7 @@ msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2279,7 +2360,7 @@ msgstr ""
 "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
@@ -2338,17 +2419,17 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
@@ -2493,7 +2574,7 @@ msgstr "設定箇所の内容を表示するだけです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2577,7 +2658,7 @@ msgstr ""
 "<filename>package.config.XXXX</filename> と言った形になります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
@@ -2848,14 +2929,25 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. 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</"
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
@@ -2866,13 +2958,13 @@ msgstr ""
 "<literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr "generate"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2886,13 +2978,13 @@ msgstr ""
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr "clean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2902,13 +2994,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2926,7 +3018,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2935,13 +3027,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr "Dir セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 #, fuzzy
 #| msgid ""
 #| "The <literal>Dir</literal> section defines the standard directories "
@@ -2960,13 +3052,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2976,36 +3068,36 @@ msgstr ""
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr "CacheDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr "キャッシュファイルの場所を指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr "FileListDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -3015,13 +3107,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr "Default セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -3033,13 +3125,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -3051,13 +3143,13 @@ msgstr ""
 "法のデフォルトはすべて '. gzip' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -3066,13 +3158,13 @@ msgstr ""
 "deb' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -3081,13 +3173,13 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -3096,13 +3188,13 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -3111,7 +3203,7 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 #, fuzzy
 #| msgid "Contents::Compress"
 msgid "Translation::Compress"
@@ -3119,7 +3211,7 @@ msgstr "Contents::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 #, fuzzy
 #| msgid ""
 #| "This is similar to <literal>Packages::Compress</literal> except that it "
@@ -3132,13 +3224,13 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -3150,13 +3242,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr "FileMode"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -3166,14 +3258,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 #, fuzzy
 #| msgid "Description"
 msgid "LongDescription"
 msgstr "説明"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
@@ -3181,13 +3273,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr "TreeDefault セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3198,13 +3290,13 @@ msgstr ""
 "に展開します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -3215,13 +3307,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3238,13 +3330,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr "Directory"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3254,13 +3346,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3270,13 +3362,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr "Packages"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3286,13 +3378,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr "Sources"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 #, fuzzy
 #| msgid ""
 #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3306,13 +3398,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 #, fuzzy
 msgid "Translation"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -3320,13 +3412,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3337,13 +3429,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr "Contents"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3356,24 +3448,24 @@ msgstr ""
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3383,13 +3475,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr "FileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3401,13 +3493,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3420,13 +3512,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr "Tree セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3441,12 +3533,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: 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 "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 "<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ"
 "れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先"
@@ -3455,7 +3553,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3466,7 +3564,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, fuzzy, no-wrap
 #| msgid ""
 #| "for i in Sections do \n"
@@ -3484,7 +3582,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 #, fuzzy
 #| msgid ""
 #| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3499,13 +3597,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr "Sections"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3516,13 +3614,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr "Architectures"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3534,13 +3632,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr "BinOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3550,13 +3648,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3566,37 +3664,37 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr "ソース特別オーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr "BinDirectory セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3611,13 +3709,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr "Packages ファイルの出力先を設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3627,59 +3725,59 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr "Contents ファイルの出力先を設定します。(オプション)"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr "バイナリオーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr "ソースオーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr "バイナリオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3694,20 +3792,20 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3725,13 +3823,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr "ソースオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3743,13 +3841,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr "特別オーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3759,13 +3857,13 @@ msgstr ""
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr "<option>--md5</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -3776,13 +3874,13 @@ msgstr ""
 "FTPArchive::MD5</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3792,7 +3890,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3805,13 +3903,13 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3824,13 +3922,13 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3845,13 +3943,13 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3861,13 +3959,13 @@ msgstr ""
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3876,7 +3974,7 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
@@ -3884,7 +3982,7 @@ msgstr "<option>-a</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3903,14 +4001,14 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 #, fuzzy
 #| msgid "<option>--version</option>"
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3924,14 +4022,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 #, fuzzy
 #| msgid "<option>--version</option>"
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3942,21 +4040,21 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3966,7 +4064,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4034,26 +4132,21 @@ 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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -4094,12 +4187,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: 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 "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
 "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"
@@ -4107,13 +4206,13 @@ msgstr ""
 "&gnome-apt;, &wajig; などがあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr "update"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -4136,13 +4235,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -4166,13 +4265,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -4190,13 +4289,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -4220,13 +4319,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -4253,7 +4352,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -4271,7 +4370,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -4280,7 +4379,7 @@ msgstr ""
 "ばなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -4293,7 +4392,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4303,7 +4402,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -4320,13 +4419,13 @@ msgstr ""
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr "remove"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4341,13 +4440,13 @@ msgstr ""
 "トールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr "purge"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4358,13 +4457,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr "source"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 #, fuzzy
 #| msgid ""
 #| "<literal>source</literal> causes <command>apt-get</command> to fetch "
@@ -4398,7 +4497,7 @@ msgstr ""
 "います。--download-only の場合はソースパッケージを展開しません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4408,7 +4507,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4418,7 +4517,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -4433,7 +4532,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4443,13 +4542,13 @@ msgstr ""
 "展開されることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr "build-dep"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
@@ -4458,13 +4557,13 @@ msgstr ""
 "に、パッケージのインストール・削除を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr "check"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4474,7 +4573,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4492,13 +4591,13 @@ msgstr ""
 "<literal>apt-get clean</literal> を実行したくなるでしょう。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr "autoclean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4517,13 +4616,13 @@ msgstr ""
 "防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr "autoremove"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -4533,13 +4632,13 @@ msgstr ""
 "され、もう必要なくなったパッケージを削除するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4548,13 +4647,13 @@ msgstr ""
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4563,13 +4662,13 @@ msgstr ""
 "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -4608,18 +4707,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4638,13 +4737,13 @@ msgstr ""
 "Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4656,7 +4755,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4675,18 +4774,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4696,7 +4795,7 @@ msgstr ""
 "行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4708,7 +4807,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 #, fuzzy
 #| msgid ""
 #| "Simulate prints out a series of lines each one representing a dpkg "
@@ -4726,23 +4825,23 @@ msgstr ""
 "空の角カッコは大した問題ではないことを表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4756,18 +4855,18 @@ msgstr ""
 "定項目 - <literal>APT::Get::Assume-Yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4776,18 +4875,18 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4796,23 +4895,23 @@ msgstr ""
 "<literal>APT::Get::Show-Versions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4821,28 +4920,28 @@ msgstr ""
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr "「推奨」パッケージもインストールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr "「推奨」パッケージをインストールしません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4855,13 +4954,13 @@ msgstr ""
 "Hold</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4873,7 +4972,7 @@ msgstr ""
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--only-upgrade</option>"
@@ -4881,7 +4980,7 @@ msgstr "<option>--no-upgrade</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 #, fuzzy
 #| msgid ""
 #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4899,13 +4998,13 @@ msgstr ""
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4919,13 +5018,13 @@ msgstr ""
 "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4946,13 +5045,13 @@ msgstr ""
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 #, fuzzy
 #| msgid ""
 #| "Use purge instead of remove for anything that would be removed.  An "
@@ -4972,13 +5071,13 @@ msgstr ""
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4987,13 +5086,13 @@ msgstr ""
 "定項目 - <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -5009,18 +5108,18 @@ msgstr ""
 "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -5042,13 +5141,13 @@ msgstr ""
 "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -5061,13 +5160,13 @@ msgstr ""
 "目 - <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -5076,13 +5175,13 @@ msgstr ""
 "項目 - <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -5095,13 +5194,13 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -5119,23 +5218,23 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -5146,13 +5245,13 @@ msgstr ""
 "Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -5161,13 +5260,13 @@ msgstr ""
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 #, fuzzy
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
@@ -5179,7 +5278,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -5187,7 +5286,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -5198,7 +5297,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -5207,22 +5306,22 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr "原著者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr "現著者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -5650,25 +5749,14 @@ msgstr "<option>--version</option>"
 msgid "Show the program version."
 msgstr "プログラムのバージョン情報を表示します"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-#, fuzzy
-#| msgid "<filename>/etc/apt/preferences</filename>"
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/etc/apt/preferences</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 #, fuzzy
 #| msgid "&apt-cache; &apt-conf;"
 msgid "&apt-get;,&aptitude;,&apt-conf;"
@@ -5676,7 +5764,7 @@ msgstr "&apt-cache; &apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -6450,11 +6538,17 @@ msgstr "Default-Release"
 
 #. 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', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 "ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト"
 "リリースです。リリース名や、コード名、リリースバージョンです。例えば "
@@ -6462,13 +6556,13 @@ msgstr ""
 "す。 &apt-preferences; も参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr "Ignore-Hold"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6478,13 +6572,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr "Clean-Installed"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -6499,12 +6593,12 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr "Immediate-Configure"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -6537,13 +6631,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr "Force-LoopBreak"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6561,39 +6655,49 @@ msgstr ""
 "不可欠パッケージで動作します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
+msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 ""
-"APT は「利用可能」情報を格納するために、固定サイズのメモリマップキャッシュ"
-"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr "Build-Essential"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr "Get"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6602,13 +6706,13 @@ msgstr ""
 "&apt-get; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr "Cache"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6617,13 +6721,13 @@ msgstr ""
 "は &apt-cache; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr "CDROM"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6633,17 +6737,53 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr "PDiffs"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6653,7 +6793,7 @@ msgstr ""
 "ルトでは True です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6664,13 +6804,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr "Queue-Mode"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6685,13 +6825,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr "Retries"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6700,13 +6840,13 @@ msgstr ""
 "えられた回数だけリトライを行います。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr "Source-Symlinks"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -6717,13 +6857,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr "http"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 #, fuzzy
 #| msgid ""
 #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -6749,7 +6889,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6774,7 +6914,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6786,7 +6926,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 #, fuzzy
 #| msgid ""
 #| "One setting is provided to control the pipeline depth in cases where the "
@@ -6814,7 +6954,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6824,7 +6964,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -6833,12 +6973,12 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 #, fuzzy
 #| msgid ""
 #| "HTTPS URIs. Cache-control and proxy options are the same as for "
@@ -6856,7 +6996,7 @@ msgstr ""
 "していません。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6878,13 +7018,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr "ftp"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 #, fuzzy
 #| msgid ""
 #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
@@ -6927,7 +7067,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -6943,7 +7083,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6957,7 +7097,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6974,12 +7114,12 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr "cdrom"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, fuzzy, no-wrap
 #| msgid "\"/cdrom/\"::Mount \"foo\";"
 msgid "/cdrom/::Mount \"foo\";"
@@ -6987,7 +7127,7 @@ msgstr "\"/cdrom/\"::Mount \"foo\";"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -7008,13 +7148,13 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr "gpgv"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -7025,18 +7165,18 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -7048,19 +7188,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -7077,13 +7217,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -7098,7 +7238,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -7109,14 +7249,14 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 #, fuzzy
 #| msgid "IndexType"
 msgid "GzipIndexes"
 msgstr "IndexType"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -7125,12 +7265,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -7143,13 +7283,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -7173,7 +7313,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -7184,13 +7324,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr "ディレクトリ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -7210,7 +7350,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -7232,7 +7372,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -7247,7 +7387,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -7259,7 +7399,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 #, fuzzy
 #| msgid ""
 #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
@@ -7284,7 +7424,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -7303,15 +7443,26 @@ msgstr ""
 "lib/dpkg/status</filename> にセットされている場合、status ファイルを "
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -7321,13 +7472,13 @@ msgstr ""
 "設定項目で、デフォルトの動作を制御します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr "Clean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -7344,7 +7495,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7354,13 +7505,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr "Updateoptions"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7369,13 +7520,13 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr "PromptAfterUpdate"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7385,13 +7536,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr "APT が dpkg を呼ぶ方法"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7401,7 +7552,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -7411,18 +7562,18 @@ msgstr ""
 "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr "Pre-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr "Post-Invoke"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7436,13 +7587,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr "Pre-Install-Pkgs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7458,7 +7609,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7474,13 +7625,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr "Run-Directory"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7490,13 +7641,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr "Build-options"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7505,12 +7656,12 @@ msgstr ""
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7525,7 +7676,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7535,7 +7686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -7549,12 +7700,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -7567,14 +7718,14 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 #, fuzzy
 #| msgid "Packages::Compress"
 msgid "PackageManager::Configure"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7591,13 +7742,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 #, fuzzy
 msgid "DPkg::ConfigurePending"
 msgstr "ユーザの設定"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7608,12 +7759,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7623,12 +7774,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7640,12 +7791,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7657,7 +7808,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -7671,12 +7822,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7690,12 +7841,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7706,7 +7857,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7717,7 +7868,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7728,7 +7879,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -7738,66 +7889,66 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "<literal>Debug::Acquire::ftp</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "<literal>Debug::Acquire::http</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "<literal>Debug::Acquire::https</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "<literal>Debug::Acquire::gpgv</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -7805,46 +7956,46 @@ msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "<literal>Debug::aptcdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "<literal>Debug::BuildDeps</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "<literal>Debug::Hashes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "<literal>Debug::IdentCDROM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7852,93 +8003,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "<literal>Debug::NoLocking</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "<literal>Debug::pkgAcquire</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr "<literal>Debug::pkgAutoRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7948,12 +8099,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7970,91 +8121,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "<literal>Debug::pkgInitConfig</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "<literal>Debug::pkgDPkgPM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "<literal>Debug::pkgOrderList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "<literal>Debug::pkgPolicy</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr "<literal>Debug::pkgProblemResolver</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -8062,12 +8213,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "<literal>Debug::sourceList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -8075,7 +8226,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -8085,7 +8236,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 #, fuzzy
 #| msgid "&apt-conf;"
 msgid "&file-aptconf;"
@@ -8094,7 +8245,7 @@ msgstr "&apt-conf;"
 # type: Content of: <refentry><refsect1><para>
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8247,24 +8398,40 @@ msgstr ""
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
+#, fuzzy
+#| msgid "priority 100"
+msgid "priority 1"
+msgstr "priority 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
 msgid "priority 100"
 msgstr "priority 100"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:102
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr "(あるならば) 既にインストールされているバージョン。"
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr "priority 500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -8272,13 +8439,13 @@ msgstr "インストールされておらず、ターゲットリリースに含
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr "priority 990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
@@ -8297,11 +8464,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: 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 "
-"uninstalled package versions."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 "ターゲットリリースが指定されていなければ、APT は単純にインストールしている"
 "パッケージのバージョンには 100 を、インストールしていないパッケージのバージョ"
@@ -8309,7 +8483,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -8319,7 +8493,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8335,13 +8509,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr "最も高い優先度のバージョンをインストールします。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8351,7 +8525,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8363,7 +8537,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8379,7 +8553,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8393,7 +8567,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8413,13 +8587,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr "APT 設定の効果"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8432,7 +8606,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8447,7 +8621,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8460,7 +8634,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8475,7 +8649,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8487,7 +8661,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8499,7 +8673,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8509,7 +8683,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -8526,7 +8700,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 #, fuzzy
 #| msgid ""
 #| "A note of caution: the keyword used here is \"<literal>origin</literal>"
@@ -8549,7 +8723,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8560,7 +8734,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8573,22 +8747,31 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: 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>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "以下のレコードは、コード名が \"<literal>squeeze</literal>\" となっているディ"
 "ストリビューションに属するパッケージを、すべて高い優先度に割り当てます。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
-#, no-wrap
+#: apt_preferences.5.xml:232
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
@@ -8597,7 +8780,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8609,7 +8792,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8622,18 +8805,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8641,13 +8824,13 @@ msgstr ""
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8656,13 +8839,13 @@ msgstr ""
 "含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8671,13 +8854,13 @@ msgstr ""
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8687,13 +8870,13 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8702,19 +8885,19 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr "このバージョンのインストール禁止"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8726,7 +8909,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8740,7 +8923,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8750,7 +8933,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8779,13 +8962,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr "すると、以下のように動作します。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8800,7 +8983,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8812,7 +8995,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8826,13 +9009,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8843,30 +9026,30 @@ msgstr ""
 "filename> ファイルを提供します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr "その名前のパッケージのバージョン番号"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8886,13 +9069,13 @@ msgstr ""
 "type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -8910,26 +9093,27 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 "このディレクトリツリーに属する全パッケージのアーカイブ名です。例え"
 "ば、\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親"
@@ -8939,14 +9123,15 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "Pin: release a=stable\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release a=stable\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8962,7 +9147,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8974,13 +9159,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8998,19 +9183,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -9023,19 +9208,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -9048,24 +9233,25 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: 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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 "<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
 "<replaceable>dist-name</replaceable></filename> にあります。例えば、 "
@@ -9077,7 +9263,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -9103,13 +9289,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT 設定レコードのオプション行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -9120,13 +9306,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9151,7 +9337,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -9167,8 +9353,8 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9181,7 +9367,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -9194,14 +9380,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -9215,13 +9401,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や不安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9250,7 +9436,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -9268,7 +9454,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -9281,14 +9467,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -9307,13 +9493,13 @@ msgstr ""
 "の最新版にアップグレードします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:600
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9332,9 +9518,9 @@ msgstr ""
 #| "Pin-Priority: -10\n"
 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -9362,7 +9548,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -9378,36 +9564,36 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: 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\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
 "新の <literal>stable</literal> バージョンにアップグレードできます。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: 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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 "以下のコマンドで、指定したパッケージを <literal>unstable</literal> ディストリ"
 "ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"
@@ -9418,7 +9604,7 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 #, fuzzy
 #| msgid "apt_preferences"
 msgid "&file-preferences;"
@@ -9426,7 +9612,7 @@ msgstr "apt_preferences"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9675,10 +9861,14 @@ msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, no-wrap
+#, 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"
+#| "   "
 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"
+"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"
@@ -9895,9 +10085,13 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 # type: Content of: <refentry><refsect1><para>
 #. 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/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 "ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
 "stable/contrib のみを使用します。"
@@ -9905,8 +10099,9 @@ msgstr ""
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 # type: Content of: <refentry><refsect1><para>
@@ -11115,6 +11310,40 @@ msgstr ""
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
+#~ msgid ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+#~ msgstr ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+
+# type: Content of: <refentry><refsect1><para>
+#, fuzzy
+#~| msgid "<filename>/etc/apt/preferences</filename>"
+#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
+#~ msgstr "<filename>/etc/apt/preferences</filename>"
+
+#~ msgid "Cache-Limit"
+#~ msgstr "Cache-Limit"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
+#~ "information. This sets the size of that cache (in bytes)."
+#~ msgstr ""
+#~ "APT は「利用可能」情報を格納するために、固定サイズのメモリマップキャッシュ"
+#~ "ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
+
+# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
+#~ msgid "Pin: release n=squeeze\n"
+#~ msgstr "Pin: release n=squeeze\n"
+
 # type: Content of: <refentry><refsect1><refsect2><para>
 #, fuzzy
 #~ msgid ""
diff --git a/doc/po/pl.po b/doc/po/pl.po
index cf4440b47..3d36762b8 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2010-03-18 22:00+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -543,22 +543,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -572,7 +556,7 @@ msgstr ""
 ">\n"
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -600,7 +584,7 @@ msgstr ""
 "   <productname>Linux</productname>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -610,7 +594,7 @@ msgstr ""
 "\"> \n"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -626,7 +610,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -646,7 +630,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -666,7 +650,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -684,7 +668,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -696,7 +680,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -714,7 +698,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -731,7 +715,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -757,7 +741,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -777,7 +761,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -801,7 +785,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -822,7 +806,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry>\n"
@@ -858,7 +842,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -887,7 +871,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -913,7 +897,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -929,7 +913,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -945,7 +929,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -961,7 +945,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -978,7 +962,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -1002,7 +986,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1018,7 +1002,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1034,7 +1018,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1050,7 +1034,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -1068,7 +1052,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1084,7 +1068,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -1100,7 +1084,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -1118,7 +1102,31 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:375
+#: 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"
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+"     <listitem><para>Lokalizacje, z których będą ściągane pakiety.\n"
+"     Pozycja w pliku konfiguracyjnym: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1127,7 +1135,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TŁUMACZENIE\">\n"
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1145,7 +1153,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1165,6 +1173,13 @@ msgstr ""
 "     oryginał zostanie zaktualizowany, a tłumaczenie - nie.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1250,7 +1265,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -1273,7 +1288,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1813,8 +1828,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr "opcje"
 
@@ -1841,7 +1856,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1869,12 +1884,12 @@ msgstr ""
 "Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1916,18 +1931,94 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-pre-depends</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+#, fuzzy
+#| msgid "<option>--no-download</option>"
+msgid "<option>--no-depends</option>"
+msgstr "<option>--no-download</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+#, fuzzy
+#| msgid "<option>--install-recommends</option>"
+msgid "<option>--no-recommends</option>"
+msgstr "<option>--install-recommends</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-suggests</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+#, fuzzy
+#| msgid "<option>--no-mount</option>"
+msgid "<option>--no-conflicts</option>"
+msgstr "<option>--no-mount</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-breaks</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-replaces</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-enhances</option>"
+msgstr "<option>--no-act</option>"
+
+#
+#. 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 "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+"Powoduje, że zależności w poleceniach <literal>depends</literal> i "
+"<literal>rdepends</literal> będą zależnościami rekurencyjnymi, tak że "
+"wszystkie wymienione pakiety zostaną wypisane tylko raz. Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1936,18 +2027,18 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1965,18 +2056,18 @@ msgstr ""
 "AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1988,18 +2079,18 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2008,13 +2099,13 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2026,13 +2117,13 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2044,13 +2135,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2061,48 +2152,48 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr "Pliki"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr "Zobacz także"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2244,7 +2335,7 @@ msgid "Options"
 msgstr "Opcje"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2290,7 +2381,7 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
@@ -2350,17 +2441,17 @@ msgstr ""
 "znajdzie wszystkie takie pliki."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
@@ -2496,7 +2587,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2574,7 +2665,7 @@ msgstr ""
 "config.XXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
@@ -2797,17 +2888,18 @@ msgid ""
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2817,25 +2909,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 #, fuzzy
 msgid "The Generate Configuration"
 msgstr "Plik konfiguracyjny"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2846,18 +2938,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr "Dir Section"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2866,12 +2958,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2879,44 +2971,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2924,12 +3016,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2938,74 +3030,74 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 #, fuzzy
 #| msgid "Packages::Compress"
 msgid "Translation::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -3013,38 +3105,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 #, fuzzy
 #| msgid "Description"
 msgid "LongDescription"
 msgstr "Opis"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3052,12 +3144,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -3065,12 +3157,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3081,62 +3173,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 #, fuzzy
 #| msgid "Operation"
 msgid "Translation"
 msgstr "Kolejne kroki"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -3144,12 +3236,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3157,12 +3249,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3171,34 +3263,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3206,12 +3298,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3220,12 +3312,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3235,16 +3327,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:364
 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>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3252,7 +3344,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -3266,7 +3358,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3274,12 +3366,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr "Sections"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3287,12 +3379,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3300,57 +3392,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 #, fuzzy
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3360,65 +3452,65 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 #, fuzzy
 msgid "The Binary Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3428,19 +3520,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3451,13 +3543,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 #, fuzzy
 msgid "The Source Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3465,12 +3557,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3478,12 +3570,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr "<option>--md5</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -3491,13 +3583,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 #, fuzzy
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
@@ -3508,7 +3600,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3522,13 +3614,13 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 #, fuzzy
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3542,12 +3634,12 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3557,13 +3649,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 #, fuzzy
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
@@ -3575,13 +3667,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 #, fuzzy
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@ -3591,14 +3683,14 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3618,13 +3710,13 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 #, fuzzy
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3638,13 +3730,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 #, fuzzy
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3654,19 +3746,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3674,7 +3766,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3705,30 +3797,60 @@ msgstr "Narzędzie zarządzania pakietami APT -- interfejs linii poleceń"
 
 #. 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> "
 "<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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -3772,12 +3894,18 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: 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 "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>apt-get</command> jest narzędziem do zarządzania pakietami "
 "działającym z linii poleceń, które może być za wewnętrzne narzędzie innych "
@@ -3786,13 +3914,13 @@ msgstr ""
 "&wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr "update"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3816,13 +3944,13 @@ msgstr ""
 "<filename>Packages.gz</filename> nie jest wcześniej znany."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3847,13 +3975,13 @@ msgstr ""
 "wcześniej wykonać <literal>update</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3871,13 +3999,13 @@ msgstr ""
 "nowych)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3901,13 +4029,13 @@ msgstr ""
 "poszczególnych pakietów."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3937,7 +4065,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3955,7 +4083,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -3965,7 +4093,7 @@ msgstr ""
 "ostrożnie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3986,7 +4114,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -3996,7 +4124,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -4017,13 +4145,13 @@ msgstr ""
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr "remove"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4037,12 +4165,12 @@ msgstr ""
 "pakiet zostanie zainstalowany zamiast zostać usunięty."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4053,13 +4181,13 @@ msgstr ""
 "wszystkie pliki konfiguracyjne)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr "source"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -4079,7 +4207,7 @@ msgstr ""
 "wydanie</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4095,7 +4223,7 @@ msgstr ""
 "jest zainstalowana lub możliwa do zainstalowania."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4109,7 +4237,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -4125,7 +4253,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4136,13 +4264,13 @@ msgstr ""
 "ściągnięte oryginalne źródła programu ze strony jego autorów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr "build-dep"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
@@ -4152,13 +4280,13 @@ msgstr ""
 "źródłowego."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr "check"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4168,7 +4296,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4187,13 +4315,13 @@ msgstr ""
 "literal>, aby zwolnić trochę miejsca na dysku."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr "autoclean"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4213,12 +4341,12 @@ msgstr ""
 "zawierających zainstalowane pakiety."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -4229,12 +4357,12 @@ msgstr ""
 "potrzebne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4243,13 +4371,13 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4259,13 +4387,13 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4292,18 +4420,18 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4322,13 +4450,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4341,7 +4469,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4361,18 +4489,18 @@ msgstr ""
 "spodziewa.  Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4383,7 +4511,7 @@ msgstr ""
 "Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4403,7 +4531,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4417,23 +4545,23 @@ msgstr ""
 "znana (rzadkość)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4449,18 +4577,18 @@ msgstr ""
 "Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4470,18 +4598,18 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4490,23 +4618,23 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4515,28 +4643,28 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr "Instaluje również rekomendowane pakiety."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr "Nie instaluje rekomendowanych pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4550,13 +4678,13 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4569,7 +4697,7 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--only-upgrade</option>"
@@ -4577,7 +4705,7 @@ msgstr "<option>--no-upgrade</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 #, fuzzy
 #| msgid ""
 #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4596,13 +4724,13 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4618,13 +4746,13 @@ msgstr ""
 "force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4646,13 +4774,13 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4666,13 +4794,13 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4681,13 +4809,13 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4704,18 +4832,18 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4738,13 +4866,13 @@ msgstr ""
 "stronę podręcznika &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4758,13 +4886,13 @@ msgstr ""
 "Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4774,12 +4902,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4793,13 +4921,13 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4818,23 +4946,23 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4845,13 +4973,13 @@ msgstr ""
 "Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4862,12 +4990,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4878,7 +5006,7 @@ msgstr ""
 "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4888,7 +5016,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4900,7 +5028,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4909,22 +5037,22 @@ msgstr ""
 "w przypadku błędu."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTORZY ORYGINAŁU"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr "OBECNI AUTORZY"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -5303,30 +5431,19 @@ msgstr "<option>--version</option>"
 msgid "Show the program version."
 msgstr "Wyświetla wersję programu."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
-"Lista stanów pakietów zainstalowanych automatycznie. Pozycja w pliku "
-"konfiguracyjnym:  <literal>Dir::State</literal> ustawia ścieżkę do pliku o "
-"nazwie <filename>extended_states</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5879,30 +5996,30 @@ msgstr "Default-Release"
 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;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr "Ignore-Hold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 #, fuzzy
 msgid "Clean-Installed"
 msgstr "B<--installed>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -5911,12 +6028,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -5949,12 +6066,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5965,83 +6082,131 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-#, fuzzy
-msgid "Cache-Limit"
-msgstr "Cache"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr "Get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr "Cache"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr "CDROM"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6052,12 +6217,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6067,37 +6232,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 #, fuzzy
 msgid "Source-Symlinks"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr "http"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6108,7 +6273,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6122,7 +6287,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6130,7 +6295,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -6142,7 +6307,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6152,7 +6317,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -6160,12 +6325,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -6175,7 +6340,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6196,12 +6361,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr "ftp"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6220,7 +6385,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -6230,7 +6395,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6239,7 +6404,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6249,18 +6414,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr "cdrom"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6273,12 +6438,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr "gpgv"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6286,18 +6451,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6309,19 +6474,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -6338,13 +6503,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -6359,7 +6524,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -6369,12 +6534,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6383,12 +6548,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -6401,13 +6566,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6430,19 +6595,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -6454,7 +6619,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6467,7 +6632,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6477,7 +6642,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -6485,7 +6650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6496,7 +6661,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6508,13 +6673,24 @@ msgid ""
 "filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6522,13 +6698,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 #, fuzzy
 msgid "Clean"
 msgstr "B<clean>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -6539,51 +6715,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 #, fuzzy
 msgid "Updateoptions"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -6591,17 +6767,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -6610,12 +6786,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -6625,7 +6801,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -6635,37 +6811,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 #, fuzzy
 msgid "Build-options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6680,7 +6856,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -6694,7 +6870,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -6708,12 +6884,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr "DPkg::NoTriggers"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -6725,12 +6901,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr "PackageManager::Configure"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -6746,12 +6922,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr "DPkg::ConfigurePending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -6762,12 +6938,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr "DPkg::TriggersPending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6777,12 +6953,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr "PackageManager::UnpackAll"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -6794,12 +6970,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr "OrderList::Score::Immediate"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -6817,7 +6993,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -6831,12 +7007,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -6845,13 +7021,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 #, fuzzy
 msgid "Debug options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -6862,7 +7038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6870,7 +7046,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6878,7 +7054,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -6888,7 +7064,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 #, fuzzy
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -6898,104 +7074,104 @@ msgstr ""
 "in CDROM IDs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "<literal>Debug::Acquire::ftp</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "<literal>Debug::Acquire::http</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "<literal>Debug::Acquire::https</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "<literal>Debug::Acquire::gpgv</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "<literal>Debug::aptcdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "<literal>Debug::BuildDeps</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "<literal>Debug::Hashes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "<literal>Debug::IdentCDROM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7003,93 +7179,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "<literal>Debug::NoLocking</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "<literal>Debug::pkgAcquire</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr "<literal>Debug::pkgAutoRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7099,12 +7275,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7121,91 +7297,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "<literal>Debug::pkgInitConfig</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "<literal>Debug::pkgDPkgPM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "<literal>Debug::pkgOrderList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "<literal>Debug::pkgPolicy</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr "<literal>Debug::pkgProblemResolver</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -7213,32 +7389,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "<literal>Debug::sourceList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr "&file-aptconf;"
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -7353,33 +7529,48 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-msgid "priority 100"
+#, fuzzy
+#| msgid "priority 100"
+msgid "priority 1"
 msgstr "priorytet 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+msgid "priority 100"
+msgstr "priorytet 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr "priorytet 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr "priorytet 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -7393,22 +7584,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:123
 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."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7418,19 +7611,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7438,7 +7631,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -7448,7 +7641,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -7457,7 +7650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -7469,12 +7662,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -7483,7 +7676,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -7493,7 +7686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -7505,7 +7698,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -7515,7 +7708,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -7523,7 +7716,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -7535,7 +7728,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -7544,7 +7737,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -7560,7 +7753,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -7570,7 +7763,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -7578,7 +7771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -7590,19 +7783,23 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:228
 msgid ""
 "The following record assigns a high priority to all package versions "
-"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
-#, no-wrap
+#: apt_preferences.5.xml:232
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
@@ -7610,7 +7807,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -7618,7 +7815,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -7630,17 +7827,17 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -7650,12 +7847,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -7665,12 +7862,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -7680,12 +7877,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -7695,12 +7892,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -7709,17 +7906,17 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -7727,7 +7924,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -7736,14 +7933,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -7771,12 +7968,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr "Wtedy:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -7786,7 +7983,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -7794,7 +7991,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -7803,12 +8000,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7816,27 +8013,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr "linia <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr "podaje nazwę pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr "linia <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr "podaje numer wersji danego pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7849,12 +8046,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -7865,34 +8062,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr "linia <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:392
 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "Pin: release a=stable\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -7902,7 +8101,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -7914,12 +8113,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr "linia <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -7930,18 +8129,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr "linia <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -7950,18 +8149,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -7970,26 +8169,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:363
 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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8004,12 +8204,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8017,12 +8217,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8046,7 +8246,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8056,8 +8256,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8069,7 +8269,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 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 "
@@ -8078,13 +8278,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8093,12 +8293,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8126,7 +8326,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -8137,7 +8337,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 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 "
@@ -8146,13 +8346,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -8164,18 +8364,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -8203,7 +8403,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8218,39 +8418,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:617
 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\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:628
 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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -8453,10 +8653,14 @@ msgstr "Kilka przykładów:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, no-wrap
+#, 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"
+#| "   "
 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"
+"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"
@@ -8664,17 +8868,22 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. 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/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 "Użycie FTP do uzyskania dostępu do archiwum na komputerze ftp.debian.org i "
 "dystrybucji stable/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -10264,3 +10473,35 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 #: offline.sgml:234
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
+
+#~ msgid ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+#~ msgstr ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+
+#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
+#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
+
+#~ msgid ""
+#~ "Status list of auto-installed packages.  Configuration Item: "
+#~ "<literal>Dir::State</literal> sets the path to the "
+#~ "<filename>extended_states</filename> file."
+#~ msgstr ""
+#~ "Lista stanów pakietów zainstalowanych automatycznie. Pozycja w pliku "
+#~ "konfiguracyjnym:  <literal>Dir::State</literal> ustawia ścieżkę do pliku "
+#~ "o nazwie <filename>extended_states</filename>."
+
+#, fuzzy
+#~ msgid "Cache-Limit"
+#~ msgstr "Cache"
+
+#~ msgid "Pin: release n=squeeze\n"
+#~ msgstr "Pin: release n=squeeze\n"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 48ffa011e..1fb706d41 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.7.26~exp3\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2010-03-19 00:21+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -531,22 +531,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -560,7 +544,7 @@ msgstr ""
 ">\n"
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -588,7 +572,7 @@ msgstr ""
 "   <productname>Linux</productname>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -598,7 +582,7 @@ msgstr ""
 "\"> \n"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -614,7 +598,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -634,7 +618,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -654,7 +638,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -672,7 +656,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -684,7 +668,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -702,7 +686,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -718,7 +702,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -744,7 +728,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -764,7 +748,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -788,7 +772,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -808,7 +792,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, fuzzy, no-wrap
 #| msgid ""
 #| "     <varlistentry>\n"
@@ -844,7 +828,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -872,7 +856,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -898,7 +882,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -914,7 +898,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -930,7 +914,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -946,7 +930,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -962,7 +946,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -986,7 +970,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1002,7 +986,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1018,7 +1002,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1034,7 +1018,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -1052,7 +1036,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1068,7 +1052,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -1084,7 +1068,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -1102,7 +1086,31 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:375
+#: 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"
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </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"
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -1111,7 +1119,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -1129,7 +1137,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -1149,6 +1157,13 @@ msgstr ""
 "     tradução está atrasada relativamente ao conteúdo original.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1233,7 +1248,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -1254,7 +1269,7 @@ msgstr ""
 "a partir dos metadados do pacote."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1764,8 +1779,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr "opções"
 
@@ -1791,7 +1806,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1817,12 +1832,12 @@ msgstr ""
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1862,17 +1877,91 @@ msgstr ""
 "Configuração: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-pre-depends</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+#, fuzzy
+#| msgid "<option>--no-download</option>"
+msgid "<option>--no-depends</option>"
+msgstr "<option>--no-download</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+#, fuzzy
+#| msgid "<option>--install-recommends</option>"
+msgid "<option>--no-recommends</option>"
+msgstr "<option>--install-recommends</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-suggests</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+#, fuzzy
+#| msgid "<option>--no-mount</option>"
+msgid "<option>--no-conflicts</option>"
+msgstr "<option>--no-mount</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-breaks</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-replaces</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-enhances</option>"
+msgstr "<option>--no-act</option>"
+
+#. 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 "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"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>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1881,17 +1970,17 @@ msgstr ""
 "<literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1908,17 +1997,17 @@ msgstr ""
 "Configuração: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1930,17 +2019,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1949,12 +2038,12 @@ msgstr ""
 "Configuração: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1965,12 +2054,12 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1981,12 +2070,12 @@ msgstr ""
 "Configuração <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1997,46 +2086,46 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr "Veja também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2165,7 +2254,7 @@ msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2209,7 +2298,7 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
@@ -2264,17 +2353,17 @@ msgstr ""
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
@@ -2407,7 +2496,7 @@ msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2486,7 +2575,7 @@ msgstr ""
 "configuração.XXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
@@ -2722,14 +2811,25 @@ msgstr ""
 
 #. 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</"
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "Valores para os campos de metadados adicionais no ficheiro Release são "
 "tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
@@ -2741,12 +2841,12 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2762,12 +2862,12 @@ msgstr ""
 "definições requeridas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2777,12 +2877,12 @@ msgstr ""
 "são necessários."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr "A Configuração do Generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2799,7 +2899,7 @@ msgstr ""
 "árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2807,12 +2907,12 @@ msgstr ""
 "abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr "Secção Dir"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2825,12 +2925,12 @@ msgstr ""
 "posteriores para produzir um caminho completo e absoluto."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2840,32 +2940,32 @@ msgstr ""
 "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr "Especifica a localização dos ficheiros de sobrepor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr "Especifica a localização dos ficheiros de cache"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2874,12 +2974,12 @@ msgstr ""
 "definição <literal>FileList</literal> for usada mais abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr "Secção Default"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2890,12 +2990,12 @@ msgstr ""
 "sobrepor estas predefinições em uma definição por-secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2908,12 +3008,12 @@ msgstr ""
 "predefinição para todos os esquemas de compressão é '. gzip'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2922,12 +3022,12 @@ msgstr ""
 "pacote. A predefinição é '.deb'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2936,12 +3036,12 @@ msgstr ""
 "controla a compressão para os ficheiros das Fontes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2950,12 +3050,12 @@ msgstr ""
 "fontes. A predefinição é '.dsc'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2964,14 +3064,14 @@ msgstr ""
 "controla a compressão para os ficheiros de Conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 #, fuzzy
 #| msgid "Contents::Compress"
 msgid "Translation::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 #, fuzzy
 #| msgid ""
 #| "This is similar to <literal>Packages::Compress</literal> except that it "
@@ -2984,12 +3084,12 @@ msgstr ""
 "controla a compressão para os ficheiros de Conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -3000,12 +3100,12 @@ msgstr ""
 "Links</literal> por secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -3015,26 +3115,26 @@ msgstr ""
 "independentemente do umask."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 #, fuzzy
 #| msgid "Description"
 msgid "LongDescription"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr "Secção TreeDefault"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3045,12 +3145,12 @@ msgstr ""
 "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -3061,12 +3161,12 @@ msgstr ""
 "alguns dias todos sejam reconstruídos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3084,12 +3184,12 @@ msgstr ""
 "modo. A predefinição é 10, as unidades são em dias."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3098,12 +3198,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3112,12 +3212,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3126,12 +3226,12 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -3140,14 +3240,14 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 #, fuzzy
 #| msgid "Operation"
 msgid "Translation"
 msgstr "Operação"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -3155,12 +3255,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3171,12 +3271,12 @@ msgstr ""
 "$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3190,22 +3290,22 @@ msgstr ""
 "ficheiros pacotes todos juntos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3214,12 +3314,12 @@ msgstr ""
 "secções podem partilhar a mesma base de dados."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3231,12 +3331,12 @@ msgstr ""
 "arquivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3249,12 +3349,12 @@ msgstr ""
 "arquivo. Isto é usado quando se processa índices de fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr "Secção Tree"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3269,12 +3369,18 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: 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 "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 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 é "
@@ -3282,7 +3388,7 @@ msgstr ""
 "definição tal como <filename>dists/woody</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3293,7 +3399,7 @@ msgstr ""
 "variáveis."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -3307,7 +3413,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3318,12 +3424,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr "Sections"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3334,12 +3440,12 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr "Architectures"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3350,12 +3456,12 @@ msgstr ""
 "indicar que esta árvore tem um arquivo fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3364,12 +3470,12 @@ msgstr ""
 "informação de secção, prioridade e endereço do responsável."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3378,32 +3484,32 @@ msgstr ""
 "informação de secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr "Define o ficheiro de sobreposição extra binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr "Define o ficheiro de sobreposição extra fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr "Secção BinDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3418,12 +3524,12 @@ msgstr ""
 "definições <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr "Define a saída do ficheiro Packages."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3432,52 +3538,52 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr "Define a saída do ficheiro Contents (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr "Define o ficheiro de sobreposição binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr "Define o ficheiro de sobreposição fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr "Define a base de dados de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr "Acrescenta um caminho a todos os caminhos de saída."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr "Especifica o ficheiro de lista de ficheiros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr "O Ficheiro Binary Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3492,19 +3598,19 @@ msgstr ""
 "permutação do responsável."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3521,12 +3627,12 @@ msgstr ""
 "formato substitui incondicionalmente o campo do responsável."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr "O Ficheiro Source Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3537,12 +3643,12 @@ msgstr ""
 "nome de pacote fonte, o segundo é a secção onde o atribuir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr "O Ficheiro Extra Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3553,12 +3659,12 @@ msgstr ""
 "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr "<option>--md5</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -3569,12 +3675,12 @@ msgstr ""
 "<literal>APT::FTPArchive::MD5</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3583,7 +3689,7 @@ msgstr ""
 "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3597,12 +3703,12 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3615,12 +3721,12 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3636,12 +3742,12 @@ msgstr ""
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3652,12 +3758,12 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3666,12 +3772,12 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3685,12 +3791,12 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3714,12 +3820,12 @@ msgstr ""
 "as verificações extras serão desnecessárias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 #, fuzzy
 #| msgid ""
 #| "This configuration option defaults to \"<literal>true</literal>\" and "
@@ -3741,19 +3847,19 @@ msgstr ""
 "esses ficheiros com <command>apt-ftparchive</command>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr "Examples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3762,7 +3868,7 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3794,30 +3900,60 @@ msgstr ""
 
 #. 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> "
 "<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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -3864,12 +4000,18 @@ msgstr ""
 "</group> </arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: 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 "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 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 "
@@ -3878,12 +4020,12 @@ msgstr ""
 "&wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3907,12 +4049,12 @@ msgstr ""
 "ficheiros de pacotes não pode ser conhecido com antecedência."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3938,12 +4080,12 @@ msgstr ""
 "novas versões de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3959,12 +4101,12 @@ msgstr ""
 "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3988,12 +4130,12 @@ msgstr ""
 "sobrepor as definições gerais em pacotes individuais."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -4021,7 +4163,7 @@ msgstr ""
 "decisões feitas pelo sistema de resolução de conflitos do apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -4038,7 +4180,7 @@ msgstr ""
 "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -4047,7 +4189,7 @@ msgstr ""
 "e devem ser usados com cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -4067,7 +4209,7 @@ msgstr ""
 "descarregadas e instaladas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4076,7 +4218,7 @@ msgstr ""
 "instalação alternativa para pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -4095,12 +4237,12 @@ msgstr ""
 "caractere '^' ou '$', para criar uma expressão regular mais específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4115,12 +4257,12 @@ msgstr ""
 "pacote identificado será instalado em vez de removido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4131,12 +4273,12 @@ msgstr ""
 "configuração são também apagados)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -4155,7 +4297,7 @@ msgstr ""
 "<literal>pkg/release</literal>, se possível."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4171,7 +4313,7 @@ msgstr ""
 "instalada ou pode instalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4184,7 +4326,7 @@ msgstr ""
 "pacote fonte não será desempacotado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -4199,7 +4341,7 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4210,12 +4352,12 @@ msgstr ""
 "balls fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
@@ -4224,12 +4366,12 @@ msgstr ""
 "tentativa de satisfazer dependências de compilação para um pacote fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4238,7 +4380,7 @@ msgstr ""
 "de pacotes e verifica por dependências quebradas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4257,12 +4399,12 @@ msgstr ""
 "libertar espaço do disco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4281,12 +4423,12 @@ msgstr ""
 "pacotes instalados sejam apagados se estiver definida para 'off'."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -4297,12 +4439,12 @@ msgstr ""
 "que já não são necessários."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4311,12 +4453,12 @@ msgstr ""
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4326,12 +4468,12 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4359,17 +4501,17 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4388,12 +4530,12 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4404,7 +4546,7 @@ msgstr ""
 "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4424,17 +4566,17 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4445,7 +4587,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4463,7 +4605,7 @@ msgstr ""
 "get</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4476,22 +4618,22 @@ msgstr ""
 "vazios significam quebras que não têm consequência (raro)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4507,17 +4649,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4527,17 +4669,17 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4546,22 +4688,22 @@ msgstr ""
 "Configuração: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4570,27 +4712,27 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr "Também instala pacotes recomendados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr "Não instala pacotes recomendados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4603,12 +4745,12 @@ msgstr ""
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4621,12 +4763,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--only-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4639,12 +4781,12 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4659,12 +4801,12 @@ msgstr ""
 "<literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4685,12 +4827,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4703,12 +4845,12 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4717,12 +4859,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4739,17 +4881,17 @@ msgstr ""
 "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4772,12 +4914,12 @@ msgstr ""
 "Release</literal>; veja também o manual &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4791,12 +4933,12 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4806,12 +4948,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4824,12 +4966,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4848,22 +4990,22 @@ msgstr ""
 "<literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4874,12 +5016,12 @@ msgstr ""
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4888,12 +5030,12 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4904,7 +5046,7 @@ msgstr ""
 "Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4913,7 +5055,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4924,7 +5066,7 @@ msgstr ""
 "&guidesdir;, &apt-preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4933,22 +5075,22 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTORES ORIGINAIS"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr "AUTORES ACTUAIS"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -5322,29 +5464,18 @@ msgstr "<option>--version</option>"
 msgid "Show the program version."
 msgstr "Mostra a versão do programa."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/var/lib/apt/extended_states</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
-"Lista de estado de pacotes auto-instalados. Item de Configuração: "
-"<literal>Dir::State</literal> que define o caminho para o ficheiro "
-"<filename>extended_states</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -6061,11 +6192,17 @@ msgstr "Default-Release"
 
 #. 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', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 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 "
@@ -6073,12 +6210,12 @@ msgstr ""
 "'4.0', '5.0*'. Veja também &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr "Ignore-Hold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6087,12 +6224,12 @@ msgstr ""
 "os pacotes segurados sejam ignorados na sua decisão de marcação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr "Clean-Installed"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -6106,12 +6243,12 @@ msgstr ""
 "directo de os reinstalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr "Immediate-Configure"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -6175,12 +6312,12 @@ msgstr ""
 "correcção do processo de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr "Force-LoopBreak"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6197,39 +6334,49 @@ msgstr ""
 "tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 um ficheiro de cache de memória mapeada de tamanho fixo para "
-"armazenar a informação 'disponível'. Isto define o tamanho dessa cache (em "
-"bytes)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr "Build-Essential"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 "Define quais pacote(s) são considerados dependências essenciais de "
 "compilação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr "Get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6238,12 +6385,12 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr "Cache"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6252,12 +6399,12 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr "CDROM"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6266,17 +6413,53 @@ msgstr ""
 "documentação para mais informação acerca das opções de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr "PDiffs"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6286,7 +6469,7 @@ msgstr ""
 "predefinição."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6303,12 +6486,12 @@ msgstr ""
 "limites for excedido, é descarregado o ficheiro completo em vez das patches."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr "Queue-Mode"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6323,12 +6506,12 @@ msgstr ""
 "aberta uma ligação por tipo de URI."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr "Retries"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6337,12 +6520,12 @@ msgstr ""
 "tentar, no número fornecido de vezes, obter ficheiros falhados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr "Source-Symlinks"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -6352,12 +6535,12 @@ msgstr ""
 "A predefinição é verdadeiro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr "http"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6374,7 +6557,7 @@ msgstr ""
 "especificada, será usada a variável de ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6399,7 +6582,7 @@ msgstr ""
 "suporta nenhuma destas opções."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6410,7 +6593,7 @@ msgstr ""
 "e tempos limite de dados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -6429,7 +6612,7 @@ msgstr ""
 "As máquinas que requerem isto estão em violação de RFC 2068."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6444,7 +6627,7 @@ msgstr ""
 "múltiplos servidores ao mesmo tempo.)"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -6456,12 +6639,12 @@ msgstr ""
 "identificador conhecido."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -6476,7 +6659,7 @@ msgstr ""
 "literal> ainda não é suportada."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6513,12 +6696,12 @@ msgstr ""
 "host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr "ftp"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6551,7 +6734,7 @@ msgstr ""
 "$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -6567,7 +6750,7 @@ msgstr ""
 "específica (Veja a amostra de ficheiro de configuração para exemplos)."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6581,7 +6764,7 @@ msgstr ""
 "eficiência."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6596,18 +6779,18 @@ msgstr ""
 "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr "cdrom"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6628,12 +6811,12 @@ msgstr ""
 "Comandos para desmontar podem ser especificados usando UMount."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr "gpgv"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6644,18 +6827,18 @@ msgstr ""
 "passadas ao gpgv."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr "CompressionTypes"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6674,19 +6857,19 @@ msgstr ""
 "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -6717,13 +6900,13 @@ msgstr ""
 "lista pois será adicionado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -6748,7 +6931,7 @@ msgstr ""
 "sobrepor a lista definida, irá apenas prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -6764,12 +6947,12 @@ msgstr ""
 "utilização de mirrors locais."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6778,12 +6961,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr "Languages"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -6805,13 +6988,13 @@ msgstr ""
 "de definir aqui valores impossíveis."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6851,7 +7034,7 @@ msgstr ""
 "ser \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6860,12 +7043,12 @@ msgstr ""
 "e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr "Directories"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -6884,7 +7067,7 @@ msgstr ""
 "com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6905,7 +7088,7 @@ msgstr ""
 "literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6920,7 +7103,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -6931,7 +7114,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6949,7 +7132,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6969,13 +7152,24 @@ msgstr ""
 "<filename>/var/lib/dpkg/status</filename>, então o ficheiro status será "
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6986,12 +7180,12 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr "Clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -7008,7 +7202,7 @@ msgstr ""
 "descarregar novos pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7017,12 +7211,12 @@ msgstr ""
 "comandos quando é corrido para a fase de instalação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr "Updateoptions"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7031,12 +7225,12 @@ msgstr ""
 "comandos quando é executado para a fase de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr "PromptAfterUpdate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7045,12 +7239,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr "Como o APT chama o dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7059,7 +7253,7 @@ msgstr ""
 "&dpkg;. Estas estão na secção <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -7070,17 +7264,17 @@ msgstr ""
 "um argumento único ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr "Pre-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr "Post-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7093,12 +7287,12 @@ msgstr ""
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr "Pre-Install-Pkgs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7114,7 +7308,7 @@ msgstr ""
 "deb que vai instalar, um por cada linha."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7129,12 +7323,12 @@ msgstr ""
 "dado ao <literal>Pre-Install-Pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr "Run-Directory"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7143,12 +7337,12 @@ msgstr ""
 "predefinição é <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr "Build-options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7157,12 +7351,12 @@ msgstr ""
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr "Utilização trigger do dpkg (e opções relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7188,7 +7382,7 @@ msgstr ""
 "todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7202,7 +7396,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -7226,12 +7420,12 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr "DPkg::NoTriggers"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -7252,12 +7446,12 @@ msgstr ""
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr "PackageManager::Configure"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7285,12 +7479,12 @@ msgstr ""
 "poderia não arrancar!"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr "DPkg::ConfigurePending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7308,12 +7502,12 @@ msgstr ""
 "esta opção em todas excepto na última execução."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr "DPkg::TriggersPending"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7329,12 +7523,12 @@ msgstr ""
 "configurar este pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr "PackageManager::UnpackAll"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7353,12 +7547,12 @@ msgstr ""
 "experimental e necessita de mais melhorias antes de se tornar realmente útil."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr "OrderList::Score::Immediate"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7376,7 +7570,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -7400,12 +7594,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7418,12 +7612,12 @@ msgstr ""
 "Veja o cabeçalho deste script para uma breve documentação das suas opções."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7440,7 +7634,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7451,7 +7645,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7462,7 +7656,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como um utilizador não root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -7474,7 +7668,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
@@ -7483,17 +7677,17 @@ msgstr ""
 "IDs de CDROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue-se uma lista completa de opções de depuração para o apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -7501,45 +7695,45 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "<literal>Debug::Acquire::ftp</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "<literal>Debug::Acquire::http</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "<literal>Debug::Acquire::https</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "<literal>Debug::Acquire::gpgv</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -7548,12 +7742,12 @@ msgstr ""
 "criptográficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "<literal>Debug::aptcdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -7562,23 +7756,23 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "<literal>Debug::BuildDeps</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descreve os processos de resolver dependências de compilação no &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "<literal>Debug::Hashes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -7587,12 +7781,12 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "<literal>Debug::IdentCDROM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7603,12 +7797,12 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "<literal>Debug::NoLocking</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -7618,24 +7812,24 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "<literal>Debug::pkgAcquire</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Regista no log quando os items são adicionados ou removidos da fila de "
 "download global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -7644,12 +7838,12 @@ msgstr ""
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -7659,12 +7853,12 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -7673,12 +7867,12 @@ msgstr ""
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -7686,12 +7880,12 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr "<literal>Debug::pkgAutoRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -7700,12 +7894,12 @@ msgstr ""
 "de pacotes e com a remoção de pacotes não utilizados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7720,12 +7914,12 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7755,22 +7949,22 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "<literal>Debug::pkgInitConfig</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr "Despeja a configuração predefinida para o erro standard no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "<literal>Debug::pkgDPkgPM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -7780,12 +7974,12 @@ msgstr ""
 "único."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -7794,12 +7988,12 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "<literal>Debug::pkgOrderList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -7808,12 +8002,12 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -7821,22 +8015,22 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "<literal>Debug::pkgPolicy</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr "Escreve a prioridade da cada lista de pacote no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr "<literal>Debug::pkgProblemResolver</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -7845,12 +8039,12 @@ msgstr ""
 "acontece quando é encontrado um problema de dependências complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -7861,12 +8055,12 @@ msgstr ""
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "<literal>Debug::sourceList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -7875,7 +8069,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -7884,13 +8078,13 @@ msgstr ""
 "para todas as opções possíveis."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr "&file-aptconf;"
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8050,21 +8244,36 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-msgid "priority 100"
+#, fuzzy
+#| msgid "priority 100"
+msgid "priority 1"
 msgstr "priority 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+msgid "priority 100"
+msgstr "priority 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr "para a versão que já está instalada (se alguma)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr "priority 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -8073,12 +8282,12 @@ msgstr ""
 "destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr "priority 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -8096,18 +8305,25 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: 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 "
-"uninstalled package versions."
+"uninstalled package versions, expect versions coming from archives which in "
+"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 "
 "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "
 "500 e todas as versões de pacotes não instalados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -8116,7 +8332,7 @@ msgstr ""
 "para determinar qual versão de um pacote deve instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8132,12 +8348,12 @@ msgstr ""
 "arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr "Instala a versão de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8146,7 +8362,7 @@ msgstr ""
 "(isto é, aquela com o número de versão mais alto)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8157,7 +8373,7 @@ msgstr ""
 "reinstall</literal> é fornecida, instala a que foi desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8172,7 +8388,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8186,7 +8402,7 @@ msgstr ""
 "get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8205,12 +8421,12 @@ msgstr ""
 "prioridade mais alta que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8223,7 +8439,7 @@ msgstr ""
 "um ou dois formatos, um formato específico e um formato geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8239,7 +8455,7 @@ msgstr ""
 "espaços."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8251,7 +8467,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8266,7 +8482,7 @@ msgstr ""
 "nome de domínio totalmente qualificado do site."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8278,7 +8494,7 @@ msgstr ""
 "local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8290,7 +8506,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -8299,7 +8515,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
@@ -8315,7 +8531,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 #, fuzzy
 #| msgid ""
 #| "A note of caution: the keyword used here is \"<literal>origin</literal>"
@@ -8338,7 +8554,7 @@ msgstr ""
 "\"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8349,7 +8565,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8361,22 +8577,31 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: 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>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 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>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
-#, no-wrap
+#: apt_preferences.5.xml:232
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
@@ -8384,7 +8609,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8396,7 +8621,7 @@ msgstr ""
 "\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8408,17 +8633,17 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta as Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8427,12 +8652,12 @@ msgstr ""
 "na versão do pacote (downgrade)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8441,12 +8666,12 @@ msgstr ""
 "destino, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8456,12 +8681,12 @@ msgstr ""
 "mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8471,12 +8696,12 @@ msgstr ""
 "recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8485,17 +8710,17 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 msgid "prevents the version from being installed"
 msgstr "previne a instalação da versão"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8506,7 +8731,7 @@ msgstr ""
 "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8520,7 +8745,7 @@ msgstr ""
 "determina a prioridade da versão de pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8529,7 +8754,7 @@ msgstr ""
 "registos apresentados atrás:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8557,12 +8782,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr "Então:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8577,7 +8802,7 @@ msgstr ""
 "downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8588,7 +8813,7 @@ msgstr ""
 "versões, mesmo versões que pertencem ao lançamento de destino."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8601,12 +8826,12 @@ msgstr ""
 "instalação e se nenhuma versão do pacote já estiver instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8617,27 +8842,27 @@ msgstr ""
 "descrever os pacotes disponíveis nessa localização."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr "fornece o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 msgid "gives the version number for the named package"
 msgstr "fornece o número de versão do pacote nomeado"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8658,12 +8883,12 @@ msgstr ""
 "definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8680,24 +8905,33 @@ msgstr ""
 "requerer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: 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: 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"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 "
@@ -8707,13 +8941,14 @@ msgstr ""
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "Pin: release a=stable\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8729,7 +8964,7 @@ msgstr ""
 "seguintes linhas:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8741,12 +8976,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8764,18 +8999,18 @@ msgstr ""
 "a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8788,18 +9023,18 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8812,22 +9047,34 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: 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 "
 "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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 "O ficheiro <filename>Release</filename> fica normalmente no directório "
 "<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
@@ -8840,7 +9087,7 @@ msgstr ""
 "APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8865,12 +9112,12 @@ msgstr ""
 "literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais num Registo de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8881,12 +9128,12 @@ msgstr ""
 "literal>. Isto disponibiliza um espaço para comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr "Acompanhando Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8910,7 +9157,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8926,8 +9173,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8939,7 +9186,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 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 "
@@ -8952,13 +9199,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8971,12 +9218,12 @@ msgstr ""
 "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9004,7 +9251,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9021,7 +9268,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 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 "
@@ -9034,13 +9281,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9059,12 +9306,12 @@ msgstr ""
 "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 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:592
+#: apt_preferences.5.xml:600
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9083,9 +9330,9 @@ msgstr "Acompanhando a evolução de um nome de código de lançamento"
 #| "Pin-Priority: -10\n"
 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -9113,7 +9360,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -9139,12 +9386,18 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: 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 "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 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 "
@@ -9152,21 +9405,30 @@ msgstr ""
 "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: 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, "
 "<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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 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> "
@@ -9177,12 +9439,12 @@ msgstr ""
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9382,10 +9644,14 @@ msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, no-wrap
+#, 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"
+#| "   "
 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"
+"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"
@@ -9592,17 +9858,22 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. 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/contrib area."
+"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."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -11181,6 +11452,45 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+#~ msgstr ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+
+#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
+#~ msgstr "<filename>/var/lib/apt/extended_states</filename>"
+
+#~ msgid ""
+#~ "Status list of auto-installed packages.  Configuration Item: "
+#~ "<literal>Dir::State</literal> sets the path to the "
+#~ "<filename>extended_states</filename> file."
+#~ msgstr ""
+#~ "Lista de estado de pacotes auto-instalados. Item de Configuração: "
+#~ "<literal>Dir::State</literal> que define o caminho para o ficheiro "
+#~ "<filename>extended_states</filename>."
+
+#~ msgid "Cache-Limit"
+#~ msgstr "Cache-Limit"
+
+#~ msgid ""
+#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
+#~ "information. This sets the size of that cache (in bytes)."
+#~ msgstr ""
+#~ "O APT usa um ficheiro de cache de memória mapeada de tamanho fixo para "
+#~ "armazenar a informação 'disponível'. Isto define o tamanho dessa cache "
+#~ "(em bytes)."
+
+#~ msgid "Pin: release n=squeeze\n"
+#~ msgstr "Pin: release n=squeeze\n"
+
 #~ msgid ""
 #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
 #~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 7e212069a..79e986c05 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"POT-Creation-Date: 2010-06-11 10:56+0300\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -422,17 +422,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -441,7 +430,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -465,7 +454,7 @@ msgstr ""
 " </docinfo>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -473,7 +462,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -484,7 +473,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -497,7 +486,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.moconnor \"\n"
@@ -510,7 +499,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -522,7 +511,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -531,7 +520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -543,7 +532,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -554,7 +543,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -577,7 +566,7 @@ msgstr ""
 " </RefSect1>\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -595,7 +584,7 @@ msgstr ""
 " </RefSect1>\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -610,7 +599,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -623,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:270
+#: apt.ent:264
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -640,7 +629,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:282
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -657,7 +646,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:293
+#: apt.ent:287
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -681,7 +670,7 @@ msgstr ""
 "   </para>\n"
 
 #. type: Plain text
-#: apt.ent:299
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -692,7 +681,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:305
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -703,7 +692,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:311
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -714,7 +703,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:317
+#: apt.ent:311
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
@@ -725,7 +714,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:327
+#: apt.ent:321
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -740,7 +729,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:333
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -751,7 +740,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:339
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -762,7 +751,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:345
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -773,7 +762,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:352
+#: apt.ent:346
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -785,7 +774,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:358
+#: apt.ent:352
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -796,7 +785,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:364
+#: apt.ent:358
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -807,7 +796,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:371
+#: apt.ent:365
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -819,7 +808,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:375
+#: apt.ent:373
+#, no-wrap
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:377
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -828,7 +830,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
 
 #. type: Plain text
-#: apt.ent:384
+#: apt.ent:386
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -846,7 +848,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:394
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -861,6 +863,13 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -922,7 +931,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -940,7 +949,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1317,8 +1326,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr ""
 
@@ -1341,7 +1350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:561 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr ""
@@ -1362,12 +1371,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:535 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1399,34 +1408,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+msgid "<option>--no-pre-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+msgid "<option>--no-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+msgid "<option>--no-recommends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+msgid "<option>--no-suggests</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+msgid "<option>--no-conflicts</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+msgid "<option>--no-breaks</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+msgid "<option>--no-replaces</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+msgid "<option>--no-enhances</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:320
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be twicked with these flags which will omit "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:573
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1437,17 +1496,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1455,29 +1514,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1485,12 +1544,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1498,12 +1557,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1511,47 +1570,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:601 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1044 apt_preferences.5.xml:630
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 #, fuzzy
 msgid "See Also"
 msgstr "Consulte também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:621 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1650,7 +1709,7 @@ msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:529 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1686,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr ""
 
@@ -1731,17 +1790,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr ""
 
@@ -1846,7 +1905,7 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:618
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 #, fuzzy
 msgid "&apt-conf;"
@@ -1911,7 +1970,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr ""
 
@@ -2086,17 +2145,18 @@ msgid ""
 "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>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2106,24 +2166,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2134,19 +2194,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 #, fuzzy
 msgid "Dir Section"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2155,12 +2215,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2168,44 +2228,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2213,12 +2273,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2227,72 +2287,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
 msgid "Translation::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:231
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:237
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2300,37 +2360,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248 apt-ftparchive.1.xml:394
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
 #, fuzzy
 msgid "LongDescription"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250 apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2338,12 +2398,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:266
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2351,12 +2411,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:273
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2367,61 +2427,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:293 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:302
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305
+#: apt-ftparchive.1.xml:306
 #, fuzzy
 msgid "Translation"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2429,12 +2489,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2442,12 +2502,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2456,34 +2516,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:330
+#: apt-ftparchive.1.xml:331
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:333 apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:341
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2491,12 +2551,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2505,12 +2565,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:358
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2520,16 +2580,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:364
 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>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2537,7 +2597,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:374
+#: apt-ftparchive.1.xml:375
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2547,7 +2607,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:371
+#: apt-ftparchive.1.xml:372
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2555,13 +2615,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380
+#: apt-ftparchive.1.xml:381
 #, fuzzy
 msgid "Sections"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2569,12 +2629,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:390
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2582,56 +2642,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:406 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:412 apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:414 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:417 apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2641,64 +2701,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:435
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:445
+#: apt-ftparchive.1.xml:446
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:451
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:456
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:473
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:489
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -2708,19 +2768,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:493
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2731,12 +2791,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2744,12 +2804,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:514
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -2757,12 +2817,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:522
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -2770,19 +2830,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:538
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2791,12 +2851,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:546
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2805,12 +2865,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2820,12 +2880,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2833,24 +2893,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:575
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2859,12 +2919,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:581
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:582
+#: apt-ftparchive.1.xml:583
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2878,12 +2938,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:594
+#: apt-ftparchive.1.xml:595
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2893,27 +2953,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:612
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:608
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2943,26 +3003,21 @@ 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"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"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>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</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</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 "
@@ -2974,21 +3029,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:112
 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;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3002,12 +3057,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3022,12 +3077,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3038,12 +3093,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140
 msgid "dist-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3057,12 +3112,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3078,7 +3133,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3089,14 +3144,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3108,14 +3163,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3127,12 +3182,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3142,12 +3197,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3155,12 +3210,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3172,7 +3227,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3182,7 +3237,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -3191,7 +3246,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3201,7 +3256,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3209,31 +3264,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3245,12 +3300,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3262,12 +3317,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -3275,36 +3330,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -3320,17 +3375,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3342,12 +3397,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -3355,7 +3410,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3367,17 +3422,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -3385,7 +3440,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -3396,7 +3451,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3405,22 +3460,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -3430,83 +3485,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -3515,12 +3570,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -3529,12 +3584,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 msgid "<option>--only-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -3543,12 +3598,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -3558,12 +3613,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -3576,12 +3631,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3590,24 +3645,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -3618,17 +3673,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -3642,12 +3697,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3656,24 +3711,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3682,12 +3737,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -3699,22 +3754,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3722,24 +3777,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -3747,14 +3802,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3762,29 +3817,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr ""
 
@@ -4107,27 +4162,19 @@ msgstr ""
 msgid "Show the program version."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 #, fuzzy
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -4646,29 +4693,29 @@ msgstr ""
 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;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -4677,12 +4724,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -4715,12 +4762,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4731,82 +4778,131 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -4817,12 +4913,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 msgid "Queue-Mode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4832,36 +4928,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4872,7 +4968,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:308
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4886,7 +4982,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -4894,7 +4990,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:321
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@ -4906,7 +5002,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4916,7 +5012,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -4924,12 +5020,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -4939,7 +5035,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4960,12 +5056,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:366
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4984,7 +5080,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:385
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -4994,7 +5090,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:392
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -5003,7 +5099,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -5013,18 +5109,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:405
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -5037,12 +5133,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -5050,18 +5146,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -5073,19 +5169,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -5102,13 +5198,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -5123,7 +5219,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -5133,12 +5229,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:450
 msgid "GzipIndexes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:452
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -5147,12 +5243,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -5165,13 +5261,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:430
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -5194,19 +5290,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -5218,7 +5314,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -5231,7 +5327,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5241,7 +5337,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:507
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -5249,7 +5345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:511
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -5260,7 +5356,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:483
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5272,13 +5368,24 @@ msgid ""
 "filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5286,12 +5393,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:548
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -5302,50 +5409,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:521
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:529
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:579
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -5353,17 +5460,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:585
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5372,12 +5479,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:592
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5387,7 +5494,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -5397,36 +5504,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5441,7 +5548,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -5451,7 +5558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:626
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -5465,12 +5572,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:639
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -5482,12 +5589,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:646
 msgid "PackageManager::Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -5503,12 +5610,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
+#: apt.conf.5.xml:657
 msgid "DPkg::ConfigurePending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -5519,12 +5626,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5534,12 +5641,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:671
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5551,12 +5658,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5568,7 +5675,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:679
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -5582,12 +5689,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -5596,12 +5703,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5612,7 +5719,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5620,7 +5727,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5628,7 +5735,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5638,120 +5745,120 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:761
 #, fuzzy
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:765
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:772
 #, fuzzy
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:783
 #, fuzzy
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:794
 #, fuzzy
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:805
 #, fuzzy
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:771
+#: apt.conf.5.xml:816
 #, fuzzy
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:827
 #, fuzzy
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:837
 #, fuzzy
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:847
 #, fuzzy
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:850
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5759,99 +5866,99 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:858
 #, fuzzy
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:869
 #, fuzzy
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:873
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:880
 #, fuzzy
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:838
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:845
+#: apt.conf.5.xml:890
 #, fuzzy
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:856
+#: apt.conf.5.xml:901
 #, fuzzy
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
+#: apt.conf.5.xml:912
 #, fuzzy
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:916
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:878
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:889
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:892
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5861,12 +5968,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:906
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5883,96 +5990,96 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:925
+#: apt.conf.5.xml:970
 #, fuzzy
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:980
 #, fuzzy
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1001
 #, fuzzy
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:960
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:968
+#: apt.conf.5.xml:1013
 #, fuzzy
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1024
 #, fuzzy
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:993
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1049
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5980,33 +6087,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1057
 #, fuzzy
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1016
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1039
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1046
+#: apt.conf.5.xml:1091
 msgid "&file-aptconf;"
 msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1096
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -6157,23 +6264,37 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
 #, fuzzy
-msgid "priority 100"
+msgid "priority 1"
 msgstr "prioridade 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
+#, fuzzy
+msgid "priority 100"
+msgstr "prioridade 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:108
 #, fuzzy
 msgid "to the version that is already installed (if any)."
 msgstr "para a instância que já esteja instalada (caso exista)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 #, fuzzy
 msgid "priority 500"
 msgstr "prioridade 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 #, fuzzy
 msgid ""
 "to the versions that are not installed and do not belong to the target "
@@ -6182,13 +6303,13 @@ msgstr ""
 "para as instâncias que não estã instaladas e que não pertencem a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 #, fuzzy
 msgid "priority 990"
 msgstr "prioridade 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 #, fuzzy
 msgid ""
 "to the versions that are not installed and belong to the target release."
@@ -6208,19 +6329,21 @@ msgstr ""
 "Atribuirá :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: 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."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 "Caso nenhuma versão alvo tenha sido especificada, o APT simplesmente irá "
 "atribuir a prioridade 100 para todas as instâncias de pacotes instaladas e a "
 "prioridade 500 para todas as instâncias de pacotes não instaladas."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 #, fuzzy
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
@@ -6230,7 +6353,7 @@ msgstr ""
 "determinar qual instância de um pacote instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 #, fuzzy
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
@@ -6247,13 +6370,13 @@ msgstr ""
 "\"downgrade\" pode ser arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 #, fuzzy
 msgid "Install the highest priority version."
 msgstr "Instala a instância de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
@@ -6263,7 +6386,7 @@ msgstr ""
 "mais recente (ou seja, aquela com o maior número de versão)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority and version number but either "
@@ -6275,7 +6398,7 @@ msgstr ""
 "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 #, fuzzy
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
@@ -6292,7 +6415,7 @@ msgstr ""
 "forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 #, fuzzy
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -6307,7 +6430,7 @@ msgstr ""
 "upgrade</command> forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 #, fuzzy
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
@@ -6327,13 +6450,13 @@ msgstr ""
 "disponíveis possuir uma prioridade maior do que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 #, fuzzy
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 #, fuzzy
 msgid ""
 "The APT preferences file allows the system administrator to control the "
@@ -6347,7 +6470,7 @@ msgstr ""
 "das duas formas, uma forma específica e uma forma geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 #, fuzzy
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -6363,7 +6486,7 @@ msgstr ""
 "com \"<literal>5.8</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6376,7 +6499,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 #, fuzzy
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
@@ -6392,7 +6515,7 @@ msgstr ""
 "identificado pelo nome de domínio totalmente qualificado do site Internet."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 #, fuzzy
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
@@ -6405,7 +6528,7 @@ msgstr ""
 "no site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6418,7 +6541,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -6427,7 +6550,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:210
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6440,7 +6563,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:206
+#: apt_preferences.5.xml:214
 #, fuzzy
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
@@ -6457,7 +6580,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:211
+#: apt_preferences.5.xml:219
 #, fuzzy
 msgid ""
 "The following record assigns a low priority to all package versions "
@@ -6469,7 +6592,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:215
+#: apt_preferences.5.xml:223
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6482,23 +6605,23 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: 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>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "O registro a seguir atribui uma prioridade baixa para todas as versões de "
 "pacote que pertençam a qualquer distribuição cujo nome do Repositório seja "
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:224
+#: apt_preferences.5.xml:232
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "<programlisting>\n"
@@ -6507,7 +6630,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:237
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -6520,7 +6643,7 @@ msgstr ""
 "literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:242
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -6533,19 +6656,19 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:253
 #, fuzzy
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:261
 #, fuzzy
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:262
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -6555,13 +6678,13 @@ msgstr ""
 "dowgrade do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:258
+#: apt_preferences.5.xml:266
 #, fuzzy
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:267
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -6571,13 +6694,13 @@ msgstr ""
 "versão alvo, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:272
 #, fuzzy
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:265
+#: apt_preferences.5.xml:273
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6587,13 +6710,13 @@ msgstr ""
 "disponível pertencente a versão alvo ou a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:278
 #, fuzzy
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:279
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6604,13 +6727,13 @@ msgstr ""
 "seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:284
 #, fuzzy
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt;= P &lt;=100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:285
 #, fuzzy
 msgid ""
 "causes a version to be installed only if there is no installed version of "
@@ -6620,19 +6743,19 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
 #, fuzzy
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:290
 #, fuzzy
 msgid "prevents the version from being installed"
 msgstr "impede a versão de ser instalada"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:256
 #, fuzzy
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6644,7 +6767,7 @@ msgstr ""
 "seguir (a grosso modo):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
 #, fuzzy
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -6660,7 +6783,7 @@ msgstr ""
 "determinará a prioridade da versão do pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:301
 #, fuzzy
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
@@ -6670,7 +6793,7 @@ msgstr ""
 "registros apresentados anteriormente :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:297
+#: apt_preferences.5.xml:305
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6699,12 +6822,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:318
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
 #, fuzzy
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
@@ -6720,7 +6843,7 @@ msgstr ""
 "será feito um downgrade do <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
 #, fuzzy
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
@@ -6732,7 +6855,7 @@ msgstr ""
 "mesmo versões pertencentes a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:329
 #, fuzzy
 msgid ""
 "A version of a package whose origin is not the local system but some other "
@@ -6747,13 +6870,13 @@ msgstr ""
 "instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:339
 #, fuzzy
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:333
+#: apt_preferences.5.xml:341
 #, fuzzy
 msgid ""
 "The locations listed in the &sources-list; file should provide "
@@ -6765,31 +6888,31 @@ msgstr ""
 "os pacotes disponíveis nessas localidades."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:353
 #, fuzzy
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:354
 #, fuzzy
 msgid "gives the package name"
 msgstr "informa o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:349 apt_preferences.5.xml:399
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 #, fuzzy
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:358
 #, fuzzy
 msgid "gives the version number for the named package"
 msgstr "informa o número de versão do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:345
 #, fuzzy
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
@@ -6811,13 +6934,13 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:374
 #, fuzzy
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:367
+#: apt_preferences.5.xml:375
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -6835,7 +6958,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:377
+#: apt_preferences.5.xml:385
 #, fuzzy, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
@@ -6843,20 +6966,21 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:383
+#: apt_preferences.5.xml:391
 #, fuzzy
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:384
+#: 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:"
+"For example, the line \"Codename: &testing-codename;\" 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>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 "dá nome ao repositório para o qual todos os pacotes na àrvore de diretório "
 "pertencem. Por exemplo, a linha \"Archive: stable\" especifica que todos os "
@@ -6866,13 +6990,15 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:393
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
+"<programlisting>\n"
+"Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:408
 #, fuzzy
 msgid ""
 "names the release version.  For example, the packages in the tree might "
@@ -6889,7 +7015,7 @@ msgstr ""
 "das linhas a seguir."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:417
 #, fuzzy, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6902,13 +7028,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:426
 #, fuzzy
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:427
 #, fuzzy
 msgid ""
 "names the licensing component associated with the packages in the directory "
@@ -6927,7 +7053,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:436
 #, fuzzy, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
@@ -6935,13 +7061,13 @@ msgstr ""
 "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:442
 #, fuzzy
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:443
 #, fuzzy
 msgid ""
 "names the originator of the packages in the directory tree of the "
@@ -6955,7 +7081,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:449
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -6963,13 +7089,13 @@ msgstr ""
 "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:455
 #, fuzzy
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:456
 #, fuzzy
 msgid ""
 "names the label of the packages in the directory tree of the "
@@ -6982,7 +7108,7 @@ msgstr ""
 "arquivo de preferências do APT iria requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:462
 #, fuzzy, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -6990,17 +7116,18 @@ msgstr ""
 "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: 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\"/>"
+"dists/&stable-codename;/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\"/>"
 msgstr ""
 "O arquivo <filename>Release</filename> é normalmente encontrado no diretório "
 "<filename>.../dists/<replaceable>nome-distribuição</replaceable></"
@@ -7013,7 +7140,7 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:469
 #, fuzzy
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7039,13 +7166,13 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:474
+#: apt_preferences.5.xml:482
 #, fuzzy
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais em um Registro de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:484
 #, fuzzy
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
@@ -7057,13 +7184,13 @@ msgstr ""
 "</literal>. Isto oferece um local para inserir comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:485
+#: apt_preferences.5.xml:493
 #, fuzzy
 msgid "Tracking Stable"
 msgstr "Acompanhando a Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:501
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7088,7 +7215,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:487
+#: apt_preferences.5.xml:495
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -7104,8 +7231,8 @@ msgstr ""
 "outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:510 apt_preferences.5.xml:556
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, fuzzy, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -7118,7 +7245,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:513
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7131,7 +7258,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:530
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
@@ -7139,7 +7266,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:524
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7152,13 +7279,13 @@ msgstr ""
 "atualizado novamente a menos que esse comando seja executado novamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:536
 #, fuzzy
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando a Testing"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:545
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -7187,7 +7314,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:538
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -7204,7 +7331,7 @@ msgstr ""
 "versões de pacotes de outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:559
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7217,7 +7344,7 @@ msgstr ""
 "(s) última(s) versão(ões) <literal>testing</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:579
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
@@ -7225,7 +7352,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:562
+#: apt_preferences.5.xml:570
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7245,18 +7372,18 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:586
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:592
+#: 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"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
@@ -7280,7 +7407,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -7295,20 +7422,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: 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\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Com um arquivo &sources-list; apropriado e o arquivo de preferências acima, "
 "quaisquer um dos comandos a seguir farão com que o APT atualize para a(s) "
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:637
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
@@ -7316,16 +7443,16 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: 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\"/>"
+"recent <literal>&testing-codename;</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\"/>"
 msgstr ""
 "O comando a seguir fará com que o APT atualize o pacote especificado para a "
 "última versão da distribuição <literal>unstable</literal>. Assim, o comando "
@@ -7336,13 +7463,13 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:646
 #, fuzzy
 msgid "&file-preferences;"
 msgstr "apt_preferences"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:652
 #, fuzzy
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7485,8 +7612,8 @@ msgstr "Exemplos"
 #: sources.list.5.xml:114
 #, 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"
+"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 ""
 
@@ -7648,13 +7775,13 @@ msgstr ""
 #: sources.list.5.xml:208
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index a48d3adfd..c523e472d 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-11 12:38+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,143 +17,144 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: cmdline/apt-cache.cc:134
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:259
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:261
+#: cmdline/apt-cache.cc:286
 msgid "Total package structures: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:301
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:303
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:305
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:307
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:309
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:344
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:349
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:357
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:488 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1297
+#: cmdline/apt-cache.cc:1273
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1451 cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1521 cmdline/cacheset.cc:444
+#: cmdline/apt-cache.cc:1503
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1551
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1558 cmdline/apt-cache.cc:1655
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1572
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1635
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1593
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1617 cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1632
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1641
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1748 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2734 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1755
+#: cmdline/apt-cache.cc:1739
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -193,58 +194,6 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/cacheset.cc:105 cmdline/apt-get.cc:150
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: cmdline/cacheset.cc:341
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: cmdline/cacheset.cc:344
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
-
-#: cmdline/cacheset.cc:451
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr ""
-
-#: cmdline/cacheset.cc:458
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-
-#: cmdline/cacheset.cc:471
-#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
-msgstr ""
-
-#: cmdline/cacheset.cc:479 cmdline/cacheset.cc:487
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: cmdline/cacheset.cc:495
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: cmdline/cacheset.cc:503
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: cmdline/cacheset.cc:511
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
 #: cmdline/apt-cdrom.cc:77
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
@@ -301,7 +250,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1169
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
@@ -600,137 +549,142 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:128
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:156
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:335
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:337
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr ""
 
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr ""
 
-#: cmdline/apt-get.cc:349
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:349
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:354
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr ""
 
-#: cmdline/apt-get.cc:385
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:413
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:435
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:458
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: cmdline/apt-get.cc:481
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:501
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:554
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:562
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:604
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:608
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:634
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:640
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:641
+#: cmdline/apt-get.cc:647
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:657
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:668
 msgid " [Installed]"
 msgstr ""
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
 msgstr ""
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:682
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -738,164 +692,164 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:700
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:712
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:723
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:754
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:784
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:788
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:792
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:797
+#: cmdline/apt-get.cc:803
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:853
+#: cmdline/apt-get.cc:859
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:928
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr ""
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:934
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:937
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:939
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:943
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:2184 cmdline/apt-get.cc:2475
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
 #: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:1094
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:1099
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1102
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1107
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1110
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1125 cmdline/apt-get.cc:1128 cmdline/apt-get.cc:2313
-#: cmdline/apt-get.cc:2316
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:1154 cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1158
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -903,46 +857,46 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:1164 cmdline/apt-get.cc:1183
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr ""
 
-#: cmdline/apt-get.cc:1179
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1251 cmdline/apt-get.cc:2369 apt-pkg/algorithms.cc:1434
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1269
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1270 cmdline/apt-get.cc:2378
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1276
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1280
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1285
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1286
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1314
+#: cmdline/apt-get.cc:1320
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -952,35 +906,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1324
 msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1448
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1480
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1534
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1647
+#: cmdline/apt-get.cc:1653
 msgid ""
 "The following package is automatically installed and is no longer required:"
 msgid_plural ""
@@ -989,7 +943,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:1657
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -997,11 +951,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1658
+#: 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."
@@ -1017,29 +971,29 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1661 cmdline/apt-get.cc:1803
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1665
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1684
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1773
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1788
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1047,69 +1001,69 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1806
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1835
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1981
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1996
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1999 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2103 cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2219 cmdline/apt-get.cc:2495
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2235
+#: cmdline/apt-get.cc:2241
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:2246
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1117,111 +1071,111 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2341
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2404
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2416
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2434
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2454
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2470
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2500
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2520
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2660
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2687
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2708
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2739
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2780
+#: cmdline/apt-get.cc:2786
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1267,7 +1221,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2952
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1501,7 +1455,6 @@ msgstr ""
 #: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
 #: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
 #: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
-#: methods/mirror.cc:87
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1531,8 +1484,8 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
-#: apt-pkg/pkgcachegen.cc:1172 apt-pkg/pkgcachegen.cc:1178
-#: apt-pkg/pkgcachegen.cc:1324
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr ""
 
@@ -1725,7 +1678,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:735 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr ""
 
@@ -1737,7 +1690,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:777 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr ""
 
@@ -2173,7 +2126,6 @@ msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
 #: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
-#: methods/mirror.cc:93
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
@@ -2232,35 +2184,42 @@ msgstr ""
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:756
+#: apt-pkg/contrib/fileutl.cc:714
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:789
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:888
-msgid "Problem closing the gzip file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, c-format
+msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:891
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, c-format
+msgid "Problem closing the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:896
+#: apt-pkg/contrib/fileutl.cc:914
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:907
+#: apt-pkg/contrib/fileutl.cc:925
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:920
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2668,7 +2627,7 @@ msgstr ""
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1263 apt-pkg/pkgcachegen.cc:1270
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr ""
 
@@ -2682,6 +2641,7 @@ msgid "MD5Sum mismatch"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr ""
 
@@ -2891,12 +2851,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:814
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:821
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr ""
@@ -2926,82 +2886,82 @@ msgstr ""
 msgid "Could not open file '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:807
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:813
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:815
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:822
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:828
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1034
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1065
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1268
+#: apt-pkg/deb/dpkgpm.cc:1273
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1273
+#: apt-pkg/deb/dpkgpm.cc:1278
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1275
+#: 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 ""
 
-#: apt-pkg/deb/dpkgpm.cc:1281
+#: apt-pkg/deb/dpkgpm.cc:1286
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1287
+#: apt-pkg/deb/dpkgpm.cc:1292
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1294
+#: apt-pkg/deb/dpkgpm.cc:1299
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3030,18 +2990,6 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:200
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#: methods/mirror.cc:343
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
-
 #: methods/rred.cc:465
 #, c-format
 msgid ""
diff --git a/po/ar.po b/po/ar.po
index 6ab1b135b..396ec3132 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,149 +19,148 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr " الحزم العادية:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "الحزمة الوهمية تماماً:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr " الحزمة الوهمية المفردة:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr " الحزم الوهمية المختلطة:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr " مفقودة:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "مجموع المعتمدات:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "مجموع المساحة المحسوب حسابها:"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "يجب أن تعطي صيغة واحدة بالضبط"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "لم يُعثر على أية حزم"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "ملفات الحزم:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "الحزم المُدبّسة:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(غير موجود)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr " مُثبّت:"
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  مرشّح: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(لاشيء)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr " جدول النسخ:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -181,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -256,12 +257,12 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "تعذرت الكتابة إلى %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
 
@@ -555,79 +556,79 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr "فشل تغيير اسم %s إلى %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "إلا أن %s مثبت"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "إلا أنه غير قابل للتثبيت"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "إلا أنها حزمة وهمية"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "إلا أنها غير مثبتة"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "إلا أنه لن يتم تثبيتها"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " أو"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "سيتم إزالة الحزم التالية:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "سيتم الإبقاء على الحزم التالية:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "ستتم ترقية الحزم التالية:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "سيتم تثبيط الحزم التالية:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "سيتم تغيير الحزم المبقاة التالية:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (بسبب %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -635,140 +636,229 @@ msgstr ""
 "تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
 "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu أعيد تثبيتها، "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu مثبطة، "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "الحزمة %s وهميّة وتوفّرها:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [مُثبّتة]"
+
+#: cmdline/apt-get.cc:677
+msgid " [Not candidate version]"
+msgstr ""
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "الحزمة %s ليس لها مرشح تثبيت"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s هي النسخة الأحدث.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "تصحيح المعتمدات..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " فشل."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "لم يمكن تصحيح المعتمدات"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "لم يمكن تقليص مجموعة الترقية"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " تم"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "تم غض النظر عن تحذير المصادقة.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "تعذرت المصادقة على بعض الحزم"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كافية في %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "نعم، افعل ما أقوله!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -779,28 +869,28 @@ msgstr ""
 "كي تستمر اكتب العبارة '%s'\n"
 " ؟] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "إجهاض."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "هل تريد الاستمرار [Y/n]؟"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -808,122 +898,57 @@ msgstr ""
 "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
 "fix-missing؟"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "تعذر تصحيح الحزم المفقودة."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "إجهاض التثبيت."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "الحزمة %s وهميّة وتوفّرها:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [مُثبّتة]"
-
-#: cmdline/apt-get.cc:1168
-msgid " [Not candidate version]"
-msgstr ""
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "الحزمة %s ليس لها مرشح تثبيت"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s هي النسخة الأحدث.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -933,7 +958,7 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -941,11 +966,11 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -961,51 +986,31 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "إلا أنه سيتم تثبيت %s"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1013,156 +1018,181 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "حساب الترقية..."
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "فشل"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "تمّ"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ليس هناك مساحة كافية في %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1186,6 +1216,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1206,7 +1238,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1442,9 +1474,9 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
@@ -1473,10 +1505,9 @@ msgstr ""
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "قراءة قوائم الحزم"
 
@@ -1606,12 +1637,12 @@ msgstr "لم يُعثر على القرص."
 msgid "File not found"
 msgstr "لم يُعثر على الملف"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "فشيل تنفيذ stat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "فشل تعيين وقت التعديل"
 
@@ -1673,7 +1704,7 @@ msgstr "انتهى وقت الاتصال"
 msgid "Server closed the connection"
 msgstr "أغلق الخادم الاتصال"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "خطأ في القراءة"
 
@@ -1685,196 +1716,177 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "خطأ في الكتابة"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "تعذر إرسال الأمر PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "فشل EPRT، ردّ الخادم: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "تعذر إحضار الملف، ردّ الخادم '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "فشل نقل البيانات، ردّ الخادم '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "استعلام"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "تعذر الاتصال بـ%s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "الاتصال بـ%s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "إجهاض التثبيت."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
@@ -1936,20 +1948,20 @@ msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآ
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "فشلت كتابة الملف %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
@@ -1984,11 +1996,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2015,7 +2032,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "تعذر العثور على التحديد %s"
@@ -2146,152 +2163,169 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "فشل إغلاق الملف %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "مشكلة في إغلاق الملف"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
-msgstr ""
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "مشكلة في مزامنة الملف"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "مشكلة في مزامنة الملف"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "يعتمد"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "يعتمد مسبقاً"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "يستحسن"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "يقترح"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "يعارض"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "يستبدل"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "يُلغي"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "مهم"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "مطلوب"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "قياسي"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "اختياري"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "إضافي"
 
@@ -2322,7 +2356,7 @@ msgstr "فشل فتح %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "فشلت كتابة الملف %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2407,7 +2441,7 @@ msgstr ""
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2450,7 +2484,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2498,12 +2532,12 @@ msgstr ""
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "نظام الحزم '%s' غير مدعوم"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2516,178 +2550,210 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "حدث خطأ أثناء معالجة %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "الحجم غير متطابق"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2739,8 +2805,8 @@ msgstr ""
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:677
@@ -2779,143 +2845,182 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "فتح ملف التهيئة %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "تهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "تحضير %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "فتح %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "التحضير لتهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "التحضير لإزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "تم إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "التحضير لإزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "تعذر قفل دليل القائمة"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -2933,10 +3038,23 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr ""
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "تعذر العثور على الحزمة %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)"
+
 #~ msgid "       %4i %s\n"
 #~ msgstr "       %4i %s\n"
 
diff --git a/po/ast.po b/po/ast.po
index 09d2be6d3..ccabfc4b5 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,157 +2,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-07-01 18:09+0100\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
 "Language-Team: Asturian <alministradores@softastur.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "El paquete %s versión %s nun cumple una dependencia:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nun pue alcontrase'l paquete %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Total de nomes de paquetes: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total de nomes de paquetes: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales cenciellos: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales amestaos: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Versiones distintes en total: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Descriciones distintes en total: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Dependencies totales: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Relaciones versión/ficheru en total: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Relaciones descrición/ficheru en total: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Mapes de provisiones en total: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Cadenes globalizaes en total: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Espaciu de dependencies de versión en total: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Espaciu ociosu en total: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Informe del total d'espaciu: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El ficheru de paquetes %s nun ta sincronizáu."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Has de dar exautamente un patrón"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nun s'alcontraron paquetes"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nun pue alcontrase'l paquete %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Ficheros de paquete:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "La caché nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Paquetes na chincheta:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nun s'alcontró)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instaláu: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidatu: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(dengún)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Chincheta de paquetes: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pa %s compiláu en %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -173,6 +174,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -308,12 +310,12 @@ msgstr ""
 "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nun se pue escribir en %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?"
 
@@ -649,79 +651,79 @@ msgstr "Problema al desenllazar %s"
 msgid "Failed to rename %s to %s"
 msgstr "Nun pudo renomase %s como %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación d'espresión regular - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Los siguientes paquetes nun cumplen dependencies:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s ta instaláu"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero %s ta pa instalar"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "pero nun ye instalable"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "pero ye un paquete virtual"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "pero nun ta instaláu"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "pero nun va instalase"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Van instalase los siguientes paquetes NUEVOS:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Los siguientes paquetes van DESANICIASE:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Los siguientes paquetes tan reteníos:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Los siguientes paquetes van actualizase:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Los siguientes paquetes van DESACTUALIZASE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Van camudase los siguientes paquetes reteníos:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -729,140 +731,233 @@ msgstr ""
 "AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
 "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizaos, %lu nuevos instalaos, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalaos, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizaos, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Nota, escoyendo %s pa la espresión regular '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Nota, escoyendo %s pa la espresión regular '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Escoyida la versión %s (%s) pa %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "El paquete %s ye un paquete virtual ufríu por:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instaláu]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versiones candidates"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Has d'escoyer esplícitamente unu pa instalar."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"El paquete %s nun ta disponible, otru paquete refierse a él.\n"
+"Esto puede significar que falta el paquete, ta arrumbáu, o sólo\n"
+"ta disponible dende otra fonte\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Sicasí, los siguientes paquetes reemplacenlu:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "El paquete %s nun tien candidatu pa instalación"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Nota, escoyendo %s nel llugar de %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s yá ta na versión más nueva.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s axustáu como instaláu manualmente.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Iguando dependencies..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " falló."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Nun pudieron iguase les dependencies"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Nun pue amenorgase'l conxuntu d'actualización"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Fecho"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Habríes d'executar 'apt-get -f install' para igualo."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencies incumplíes. Téntalo usando -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Avisu d'autenticación saltáu.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "¿Instalar esos paquetes ensin verificación [s/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Dellos paquetes nun pudieron autenticase"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hai problemes y utilizose -y ensin --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error internu, ordenar nun finó"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Nun pudo lleese la llista de fontes."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Que raro.. Los tamaños nun concasen, escribe a apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Hai que descargar %sB/%sB d'archivos.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Hai que descargar %sB d'archivos.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nun pue determinase l'espaciu llibre de %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nun tienes espaciu libre bastante en %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡facer lo que digo!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -873,28 +968,28 @@ msgstr ""
 "Pa continuar escribe la frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Encaboxar."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quies continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falló algamar %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Dellos ficheros nun pudieron descargase"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en mou de sólo descarga"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -902,126 +997,57 @@ msgstr ""
 "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
 "tentando --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Nun pudieron iguase los paquetes que falten."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Encaboxando la instalación."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, escoyendo %s nel llugar de %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "El paquete %s ye un paquete virtual ufríu por:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instaláu]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versiones candidates"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Has d'escoyer esplícitamente unu pa instalar."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"El paquete %s nun ta disponible, otru paquete refierse a él.\n"
-"Esto puede significar que falta el paquete, ta arrumbáu, o sólo\n"
-"ta disponible dende otra fonte\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Sicasí, los siguientes paquetes reemplacenlu:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "El paquete %s nun tien candidatu pa instalación"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s yá ta na versión más nueva.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nun s'alcontró la versión '%s' pa '%s'"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Escoyida la versión %s (%s) pa %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "La orde update nun lleva argumentos"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1035,7 +1061,7 @@ msgstr[1] ""
 "Los siguientes paquetes instalaronse de manera automática y ya nun se "
 "necesiten:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1047,11 +1073,11 @@ msgstr[1] ""
 "Los siguientes paquetes instalaronse de manera automática y ya nun se "
 "necesiten:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Usa 'apt-get autoremove' pa desinstalalos."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1069,43 +1095,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información pue aidar a resolver la situación:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error internu, AutoRemover rompió coses"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error internu, AllUpgrade rompió coses"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Nun pudo alcontrase la tarea %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Nun pudo alcontrase'l paquete %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, escoyendo %s pa la espresión regular '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s axustáu como instaláu manualmente.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1113,7 +1119,7 @@ msgstr ""
 "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
 "conseña una solución)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1125,121 +1131,146 @@ msgstr ""
 "inestable, que dellos paquetes necesarios nun se crearon o que\n"
 "s'allugaron fuera d'Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Paquetes frañaos"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Instalaránse los siguientes paquetes extra:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Paquetes afalaos:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Paquetes encamentaos"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nun pudo alcontrase'l paquete %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s axustáu como instaláu manualmente.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Calculando l'autualización... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Falló"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Fecho"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error internu, l'iguador de problemes frañó coses"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Nun pue bloquiase'l direutoriu de descarga"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nun pudo alcontrase un paquete fonte pa %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saltando'l ficheru yá descargáu '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nun hai espaciu llibre bastante en %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai falta descargar %sB d'archivos fonte.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fonte descargada %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Falló la descarga de dellos archivos."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orde de desempaquetáu '%s'.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orde build '%s'.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Falló el procesu fíu"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Hai que conseñar polo menos un paquete pa verificar les dependencies de "
 "construcción"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nun tien dependencies de construcción.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1248,7 +1279,7 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1257,32 +1288,33 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque denguna versión "
 "disponible del paquete %s satisfaz los requisitos de versión"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
 "demasiao nuevu"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcción"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1306,6 +1338,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1368,7 +1402,7 @@ msgstr ""
 "pa más información y opciones.\n"
 "                       Esti APT tien Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1623,9 +1657,9 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nun ye a lleer %s"
@@ -1655,10 +1689,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Lleendo llista de paquetes"
 
@@ -1791,12 +1824,12 @@ msgstr "Nun s'atopa'l discu."
 msgid "File not found"
 msgstr "Nun s'atopa'l ficheru."
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Falló al lleer"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Nun se pudo afitar la hora de modificación"
 
@@ -1858,7 +1891,7 @@ msgstr "Gandi
 msgid "Server closed the connection"
 msgstr "El sirvidor zarró la conexón"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Fallu de llectura"
 
@@ -1870,183 +1903,174 @@ msgstr "Una rempuesta revirti
 msgid "Protocol corruption"
 msgstr "Corrupción del protocolu"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Fallu d'escritura"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Nun se pudo crear un socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Nun se pudo coneutar un socket pasivu."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nun pudo obtener un zócalu oyente"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Nun se pudo enllazar con un socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Nun se pudo escuchar nel socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Nun se pudo determinar el nome del socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Nun se pudo mandar la orde PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Direición de familia %u desconocida (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Gandió'l tiempu de conexón col zócalu de datos"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Nun se pudo aceptar la conexón"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Hebo un problema al xenerar el hash del ficheru"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Gandió'l tiempu del zócalu de datos"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Falló la tresferencia de datos; el sirvidor dixo '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Nun se pudo invocar "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nun se pudo coneutar a %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nun se pudo coneutar a %s:%s (%s); expiró'l tiempu de conexón"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nun se pudo coneutar a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Coneutando a %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nun se pudo resolver '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallu temporal al resolver '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Daqué raru pasó resolviendo '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nun se pudo coneutar a %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Encaboxando la instalación."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Fallu internu: Robla bona, pero nun se pudo determinar la so güella dixital?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Atopóse polo menos una robla mala."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nun se pudo executar '%s' pa verificar la robla (¿ta instaláu gpgv?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Fallu desconocíu al executar gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Les siguientes robles nun valieron:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2054,16 +2078,6 @@ msgstr ""
 "Les robles siguiente nun se pudieron verificar porque la to llave pública "
 "nun ta a mano:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Nun se pudo abrir una tubería pa %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Fallu de llectura dende'l procesu %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Esperando les testeres"
@@ -2125,19 +2139,19 @@ msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Falló al francer el ficheru"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Fallu internu"
 
@@ -2174,11 +2188,16 @@ msgstr ""
 "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
 "Limit. El valor actual ye : %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2205,7 +2224,7 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Escoyeta %s que nun s'atopa"
@@ -2338,152 +2357,169 @@ msgstr "Nun se pudo cambiar a %s"
 msgid "Failed to stat the cdrom"
 msgstr "Nun se pudo montar el CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu de sólo llectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nun puede abrise'l ficheru de bloquéu %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu %s montáu per nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nun se pudo torgar %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero nun taba ellí"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El subprocesu %s recibió un fallu de segmentación."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subprocesu %s recibió un fallu de segmentación."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El subprocesu %s devolvió un códigu d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subprocesu %s terminó de manera inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nun se pudo abrir el ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nun se pudo abrir una tubería pa %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problemes zarrando'l ficheru"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problemes zarrando'l ficheru"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Hai problemes al sincronizar el ficheru"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Hai problemes desvenceyando'l ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Hai problemes al sincronizar el ficheru"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Caché de paquetes balera."
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "El ficheru de caché de paquetes ta tollíu"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "El ficheru de caché de paquetes ye una versión incompatible"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Esti APT nun soporta'l sistema de versiones '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "La caché de paquetes creóse pa una arquitectura estremada"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depende de"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Predepende de"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Suxer"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "En conflictu con"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Sustituye a"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Fai obsoletu a"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Ruempe"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "requeríu"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2513,7 +2549,7 @@ msgstr "Nun se pudo abrir el ficheru d'est
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falló la escritura del ficheru temporal d'estáu %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2598,7 +2634,7 @@ msgstr "Llinia %u mal formada na llista d'or
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2647,7 +2683,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos retenidos."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2697,12 +2733,12 @@ msgstr "El m
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza"
 
@@ -2715,142 +2751,164 @@ msgstr "Nun pudo lleese %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'estáu."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Has d'executar apt-get update pa iguar estos problemes"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Rexistru inválidu nel ficheru de preferencies, nun hai cabecera Paquete"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nun s'entiende'l tipu de pin %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Nun hai prioridá (o ye cero) conseñada pa pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "La caché tien un sistema de versiones incompatible"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Hebo un error al procesar %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Hebo un error al procesar %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Hebo un error al procesar %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Hebo un error al procesar %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Hebo un error al procesar %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Hebo un error al procesar %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Hebo un error al procesar %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Hebo un error al procesar %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Hebo un error al procesar %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vaya, perpasaste'l númberu de versiones coles que puede esti APT."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Hebo un error al procesar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Hebo un error al procesar %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Al procesar dependencies de ficheros nun s'alcontró el paquete %s %s"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Recoyendo ficheros qu'apurren"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Fallu de E/S al grabar caché d'oríxenes"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló'l cambiu de nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 nun concasa"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "La suma hash nun concasa"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2859,7 +2917,7 @@ msgstr ""
 "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
 "necesites iguar manualmente esti paquete (por faltar una arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2868,7 +2926,7 @@ msgstr ""
 "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
 "necesites iguar manualmente esti paquete"
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2876,25 +2934,35 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
 "paquete %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "El tamañu nun concasa"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Nota, escoyendo %s nel llugar de %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinia inválida nel ficheru de desviación: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2947,11 +3015,11 @@ msgstr "Buscando nel discu ficheros d'
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
-"Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y %"
-"zu firmes\n"
+"Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y "
+"%zu firmes\n"
 
 #: apt-pkg/cdrom.cc:677
 msgid ""
@@ -2989,147 +3057,186 @@ msgstr "Escribiendo llista nueva d'or
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rexistros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i rexistros escritos con %i ficheros de menos.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Escribiéronse %i rexistros con %i ficheros perdíos y %i ficheros que nun "
 "concasen\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Abriendo ficheros de configuración %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "La suma hash nun concasa"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Desinstalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando activador de post-instalación de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta'l direutoriu '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nun se pudo abrir el ficheru %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose pa configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s instaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose pa desinstalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s desinstaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose pa desinstalar dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nun puede escribise nel rexistru, falló openpty() (¿/dev/pts nun ta "
 "montáu?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nun pudo bloquiase'l direutoriu de llista"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Non bloquiáu"
 
@@ -3147,10 +3254,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Conexón encaboxada prematuramente"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Nun s'alcontró la versión '%s' pa '%s'"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Nun pudo alcontrase la tarea %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nun se pudo abrir una tubería pa %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Fallu de llectura dende'l procesu %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Hebo un error al procesar %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Llinia %u mal formada na llista d'oríxenes %s (id del proveedor)"
 
diff --git a/po/bg.po b/po/bg.po
index 4f1acaab0..8ff3c034d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,158 +9,159 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-01-27 12:41+0200\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакетът %s версия %s има неудовлетворена зависимост:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Пакетът %s не може да бъде намерен"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Общо имена на пакети : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Общо имена на пакети : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Нормални пакети: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Чисти виртуални пакети: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Единични виртуални пакети: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Смесени виртуални пакети: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Липсващи: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Общо уникални версии: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Общо уникални описания: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Общо зависимости: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Общо отношения версия/файл: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Общо отношения описание/файл: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Общо отношения „Осигурява“: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Общо разгърнати низове: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Общо пространство за зависимости по версии: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Общо празно пространство: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Общо отчетено пространство: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Пакетният файл %s не е синхронизиран."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Трябва да въведете само един израз"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Няма намерени пакети"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Пакетът %s не може да бъде намерен"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Пакетни файлове:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Отбити пакети:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(не са намерени)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Инсталирана: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(няма)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Отбиване на пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Таблица с версиите:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -181,6 +182,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -317,12 +319,12 @@ msgstr ""
 "  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Неуспех при записа на %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
 
@@ -662,79 +664,79 @@ msgstr "Неуспех при премахването на връзка на %s
 msgid "Failed to rename %s to %s"
 msgstr "Неуспех при преименуването на %s на %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Следните пакети имат неудовлетворени зависимости:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "но е инсталиран %s"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но ще бъде инсталиран %s"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "но той не може да бъде инсталиран"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "но той е виртуален пакет"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "но той не е инсталиран"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "но той няма да бъде инсталиран"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " или"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Следните пакети няма да бъдат променени:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Следните пакети ще бъдат актуализирани:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Следните задържани пакети ще бъдат променени:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (поради %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -742,145 +744,238 @@ msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
 "Това НЕ би трябвало да става освен ако знаете точно какво правите!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu актуализирани, %lu нови инсталирани, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu преинсталирани, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu върнати към по-стара версия, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu за премахване и %lu без промяна.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu не са напълно инсталирани или премахнати.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Избрана е версия %s (%s) за %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Инсталиран]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Версии кандидати"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Трябва изрично да изберете един за инсталиране."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Пакетът %s не е наличен, но е в списъка със зависимости на друг пакет.\n"
+"Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
+"само от друг източник\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Обаче следните пакети го заместват:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Пакетът %s няма кандидат за инсталиране"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Забележете, избиране на %s вместо %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s вече е най-новата версия.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s е отбелязан като ръчно инсталиран.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Коригиране на зависимостите..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " пропадна."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Неуспех при коригирането на зависимостите"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Неуспех при минимизирането на набора актуализации"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Готово"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
 "неизправности."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Инсталиране на тези пакети без проверка [y/N]?"
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Някои пакети не можаха да бъдат удостоверени"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "След тази операция ще бъде използвано %sB допълнително дисково "
 "пространство.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Неуспех при определянето на свободното пространство в %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Нямате достатъчно свободно пространство в %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Да, прави каквото казвам!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -891,28 +986,28 @@ msgstr ""
 "За да продължите, въведете фразата „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Прекъсване."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Искате ли да продължите [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Някои файлове не можаха да бъдат изтеглени"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -920,127 +1015,58 @@ msgstr ""
 "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
 "или да опитате с „--fix-missing“?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Неуспех при коригирането на липсващите пакети."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Прекъсване на инсталирането."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Забележете, избиране на %s вместо %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Инсталиран]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Версии кандидати"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Трябва изрично да изберете един за инсталиране."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Пакетът %s не е наличен, но е в списъка със зависимости на друг пакет.\n"
-"Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
-"само от друг източник\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Обаче следните пакети го заместват:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Пакетът %s няма кандидат за инсталиране"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s вече е най-новата версия.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Не е намерено издание „%s“ на „%s“"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Не е намерена версия „%s“ на „%s“"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Избрана е версия %s (%s) за %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1052,7 +1078,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1062,11 +1088,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1084,44 +1110,24 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информация може да помогне за намиране на изход от ситуацията:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Неуспех при намирането на задача %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Неуспех при намирането на пакет %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s е отбелязан като ръчно инсталиран.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1129,7 +1135,7 @@ msgstr ""
 "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1141,122 +1147,147 @@ msgstr ""
 "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
 "са били преместени от Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Счупени пакети"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Неуспех при намирането на пакет %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s е отбелязан като ръчно инсталиран.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Изчисляване на актуализацията..."
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Неуспех"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неуспех при намирането на изходен код на пакет %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Нямате достатъчно свободно пространство в %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Неуспех при получаването на информация за зависимостите за компилиране на %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1265,7 +1296,7 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1275,32 +1306,32 @@ msgstr ""
 "налични версии на пакета %s, които могат да удовлетворят изискването за "
 "версия"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
 "пакет %s е твърде нов"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1325,6 +1356,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1387,7 +1420,7 @@ msgstr ""
 "информация и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1635,9 +1668,9 @@ msgstr "Файл %s/%s заменя този в пакет %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неуспех при четенето на %s"
@@ -1667,10 +1700,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Директориите info и temp трябва да бъдат на една и съща файлова система"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Четене на списъците с пакети"
 
@@ -1803,12 +1835,12 @@ msgstr "Дискът не е намерен."
 msgid "File not found"
 msgstr "Файлът не е намерен"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Неуспех при получаването на атрибути"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Неуспех при задаването на време на промяна"
 
@@ -1870,7 +1902,7 @@ msgstr "Допустимото време за свързването изтеч
 msgid "Server closed the connection"
 msgstr "Сървърът разпадна връзката"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Грешка при четене"
 
@@ -1882,189 +1914,179 @@ msgstr "Отговорът препълни буфера."
 msgid "Protocol corruption"
 msgstr "Развален протокол"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Грешка при запис"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Неуспех при създаването на гнездо"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Неуспех при свързването на гнездо за данни, допустимото време за свъзрзване "
 "изтече"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Неуспех при свързването на пасивно гнездо."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo не успя да се добере до слушащо гнездо"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Неуспех при свързването на гнездо"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Неуспех при слушането на гнездото"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Неуспех при определянето на името на гнездото"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Неуспех при изпращането на командата PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестно семейство адреси %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Времето за установяване на връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Времето за връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Запитване"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Неуспех при извикването на "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Свързване с %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Не може да се започне свързване с %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Неуспех при свързване с %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Свързване с %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Неуспех при намирането на IP адреса на „%s“"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Временен неуспех при намирането на IP адреса на „%s“"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Неуспех при свързването с %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Прекъсване на инсталирането."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
-"на работа."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
 "ключа?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
 "gpgv?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестна грешка при изпълнението на gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Следните подписи са невалидни:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2072,16 +2094,6 @@ msgstr ""
 "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е "
 "наличен:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Неуспех при отварянето на програмен канал за %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Грешка при четене от процес %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Чакане на заглавни части"
@@ -2143,19 +2155,19 @@ msgstr "Грешка при четене от сървъра. Отдалечен
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Неуспех при отрязване на края на файла"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
@@ -2190,11 +2202,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2221,7 +2238,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Изборът %s не е намерен"
@@ -2356,155 +2373,172 @@ msgstr "Неуспех при преминаването в %s"
 msgid "Failed to stat the cdrom"
 msgstr "Неуспех при намирането на атрибутите на cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Не се използва заключване за файл за заключване %s, който е само за четене"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Неуспех при отварянето на файл за заключване %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Не се използва заключване за файл за заключване %s, който е монтиран по NFS"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Неуспех при достъпа до заключване %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Изчака се завършването на %s, но той не беше пуснат"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Подпроцесът %s върна код за грешка (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Подпроцесът %s завърши неочаквано"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Неуспех при отварянето на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Неуспех при отварянето на програмен канал за %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 "грешка при четене, все още има %lu за четене, но няма нито един останал"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "грешка при запис, все още име %lu за запис, но не успя"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Проблем при затварянето на файла"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Проблем при затварянето на файла"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Проблем при синхронизиране на файла"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Проблем при премахването на връзка към файла"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Проблем при синхронизиране на файла"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Празен кеш на пакети"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Файлът за кеш на пакети е повреден"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Файлът за кеш на пакети е несъвместима версия"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Тази версия на APT не поддържа система за версии „%s“"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Кешът на пакети е бил направен за различна архитектура"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Зависи от"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Предварително зависи от"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Предлага се"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Препоръчва се"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Конфликтира с"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Заменя"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Изважда от употреба"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Чупи"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "важен"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "изискван"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "стандартен"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "незадължителен"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "допълнителен"
 
@@ -2534,7 +2568,7 @@ msgstr "Неуспех при отварянето на StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Неуспех при запис на временен StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2625,7 +2659,7 @@ msgstr "Лошо форматиран ред %u в списъка с източ
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2677,7 +2711,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Неуспех при коригирането на проблемите, имате задържани счупени пакети."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2727,12 +2761,12 @@ msgstr "Методът %s не стартира правилно"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Пакетната система „%s“ не е поддържана"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неуспех при определянето на подходяща пакетна система"
 
@@ -2745,147 +2779,169 @@ msgstr "Неуспех при получаването на атрибути н
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Списъците с пакети или файлът за състояние не можаха да бъдат анализирани "
 "или отворени."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Невалиден запис във файла с настройки, няма заглавна част Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Неизвестен тип за отбиване %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Няма указан приоритет (или е нула) на отбиването"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Кешът има несъвместима система за версии"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Възникна грешка при обработката на %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Възникна грешка при обработката на %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Възникна грешка при обработката на %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Възникна грешка при обработката на %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Възникна грешка при обработката на %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Възникна грешка при обработката на %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Възникна грешка при обработката на %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Възникна грешка при обработката на %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Възникна грешка при обработката на %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Събиране на информация за „Осигурява“"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "преименуването се провали, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Несъответствие на контролна сума MD5"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Несъответствие на контролната сума"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2894,7 +2950,7 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет (поради пропусната архитектура)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2903,32 +2959,42 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Несъответствие на размера"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Неуспех при анализирането на пакетен файл %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Забележете, избиране на %s вместо %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправилен ред във файла с отклонения: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неуспех при анализирането на пакетен файл %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2981,8 +3047,8 @@ msgstr "Сканиране на диска за индексни файлове.
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu "
 "индекса с преводи и %zu подписа.\n"
@@ -3023,145 +3089,184 @@ msgstr "Запазване на новия списък с източници\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Записите в списъка с източници за този диск са:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записани са %i записа.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записани са %i записа с %i липсващи файла.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записани са %i записа с %i несъответстващи файла\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Отваряне на конфигурационен файл %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Несъответствие на контролната сума"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Инсталиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфигуриране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s е напълно премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Изпълнение на тригер след инсталиране %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорията „%s“ липсва"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Неуспех при отварянето на файла %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготвяне на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Разпакетиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготвяне на %s за конфигуриране"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s е инсталиран"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготвяне за премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s е премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка за пълно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
 "монтирана?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Неуспех при заключването на директорията със списъка на пакетите"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3179,10 +3284,33 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Връзката прекъсна преждевременно"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Не е намерено издание „%s“ на „%s“"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Не е намерена версия „%s“ на „%s“"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Неуспех при намирането на задача %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. "
+#~ "Завършване на работа."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Неуспех при отварянето на програмен канал за %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Грешка при четене от процес %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Възникна грешка при обработката на %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr ""
 #~ "Лошо форматиран ред %u в списъка с източници %s (идентификатор на "
diff --git a/po/bs.po b/po/bs.po
index 1d77c7f74..48e075ba7 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,157 +6,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ne mogu pronaći paket %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ne mogu pronaći paket %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -177,6 +176,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -263,12 +263,12 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ne mogu zapisati na %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
@@ -563,220 +563,310 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ali je %s instaliran"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ali se ne može instalirati"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ali je virtuelni paket"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ali nije instaliran"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ali se neće instalirati"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " ili"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:640
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:647
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr "[Instalirano]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Verzije kandidata"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr ""
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
+
+#: cmdline/apt-get.cc:712
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:788
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ali se %s treba instalirati"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Ispravljam zavisnosti..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Ne mogu ispraviti zavisnosti"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Urađeno"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -784,151 +874,85 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Odustani."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li želite nastaviti? [Y/n]"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1117
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr "[Instalirano]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Verzije kandidata"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -938,7 +962,7 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -946,11 +970,11 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -966,49 +990,29 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ali se %s treba instalirati"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1016,156 +1020,181 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "ali se %s treba instalirati"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Urađeno"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1189,6 +1218,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1209,7 +1240,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1440,9 +1471,9 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
@@ -1471,10 +1502,9 @@ msgstr ""
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Čitam spiskove paketa"
 
@@ -1604,12 +1634,12 @@ msgstr "Datoteka nije pronađena"
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1669,7 +1699,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
@@ -1682,197 +1712,178 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Odustajem od instalacije."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
@@ -1934,20 +1945,20 @@ msgstr ""
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Ne mogu ukloniti %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
@@ -1982,11 +1993,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2013,7 +2029,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -2144,153 +2160,170 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, c-format
+msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, c-format
+msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:925
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Zavisi"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Predlaže"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "važno"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "zahtijevano"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcionalno"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2321,7 +2354,7 @@ msgstr "Ne mogu otvoriti %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2406,7 +2439,7 @@ msgstr ""
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2449,7 +2482,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2497,12 +2530,12 @@ msgstr ""
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2515,177 +2548,209 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
 #, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2738,8 +2803,8 @@ msgstr ""
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:677
@@ -2777,143 +2842,182 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -2931,7 +3035,7 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 253226e7b..94b5085ef 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,156 +8,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-06-06 02:17+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "El paquet %s versió %s té una dependència sense satisfer:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "No s'ha trobat el paquet %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Nombre total de paquets: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Nombre total de paquets: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Paquets normals: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Paquets virtuals purs: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuals únics: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuals mixtes: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Total de versions diferents: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Total de descripcions diferents: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Total de dependències: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Total de relacions versió/fitxer: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Total de relacions descripció/fitxer: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Total dels mapes aportats: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Total de cadenes globals: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Total de l'espai per a dependències de versió: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Total de l'espai desperdiciat: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Total de l'espai atribuït a: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El fitxer %s del paquet està desincronitzat."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Heu de donar exactament un patró"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "No s'han trobat paquets"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "No s'ha trobat el paquet %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(no trobat)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instal·lat: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(cap)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Taula de versió:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per a %s compilat el %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -178,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -311,12 +313,12 @@ msgstr ""
 "  -c=? Llegeix aquest fitxer de configuració\n"
 "  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "No es pot escriure en %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "No es pot determinar la versió de debconf. Està instal·lat debconf?"
 
@@ -652,79 +654,79 @@ msgstr "S'ha trobat un problema treient l'enllaç %s"
 msgid "Failed to rename %s to %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Els següents paquets tenen dependències sense satisfer:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "però està instal·lat %s"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "però s'instal·larà %s"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "però no és instal·lable"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "però és un paquet virtual"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "però no està instal·lat"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "però no serà instal·lat"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "S'instal·laran els paquets NOUS següents:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Es SUPRIMIRAN els paquets següents:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "S'han mantingut els paquets següents:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "S'actualitzaran els paquets següents:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Es DESACTUALITZARAN els paquets següents:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Es canviaran els paquets retinguts següents:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (per %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -732,145 +734,240 @@ msgstr ""
 "AVÍS: Es suprimiran els paquets essencials següents.\n"
 "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualitzats, %lu nous a instal·lar, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstal·lats, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualitzats, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a suprimir i %lu no actualitzats.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instal·lats o suprimits completament.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versió seleccionada %s (%s) per a %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "El paquet %s és un paquet virtual proveït per:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instal·lat]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versions candidates"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"El paquet %s no té versió disponible, però un altre paquet\n"
+"en fa referència. Això normalment vol dir que el paquet falta,\n"
+"s'ha tornat obsolet o només és disponible des d'una altra font.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Tot i que els següents paquets el reemplacen:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "El paquet %s no té candidat d'instal·lació"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "No es possible la reinstal·lació del paquet %s, no es pot baixar.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ja es troba en la versió més recent.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "S'ha marcat %s com instal·lat manualment.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "S'estan corregint les dependències..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " ha fallat."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "No es poden corregir les dependències"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "No es pot minimitzar el joc de versions revisades"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Fet"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVÍS: No es poden autenticar els següents paquets!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "S'ha descartat l'avís d'autenticació.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "No s'ha pogut autenticar alguns paquets"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
 "trencats!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Es necessita obtenir %sB d'arxius.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Després d'aquesta operació s'empraran %sB d'espai en disc addicional.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No teniu prou espai lliure en %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Sí, fes el que et dic!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -881,28 +978,28 @@ msgstr ""
 "Per a continuar escriviu la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Avortat."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Descàrrega completa i en mode de només descàrrega"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -910,130 +1007,59 @@ msgstr ""
 "No es poden baixar alguns arxius, proveu a executar apt-get update o "
 "intenteu-ho amb --fix-missing."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "No es poden corregir els paquets que falten."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "S'està avortant la instal·lació."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "El paquet %s és un paquet virtual proveït per:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instal·lat]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versions candidates"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"El paquet %s no té versió disponible, però un altre paquet\n"
-"en fa referència. Això normalment vol dir que el paquet falta,\n"
-"s'ha tornat obsolet o només és disponible des d'una altra font.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Tot i que els següents paquets el reemplacen:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "El paquet %s no té candidat d'instal·lació"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "No es possible la reinstal·lació del paquet %s, no es pot baixar.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ja es troba en la versió més recent.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "No s'ha trobat la versió «%s» per a «%s»"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Versió seleccionada %s (%s) per a %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "No s'ha pogut llegir la llista de paquets font %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
 "automàtic"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1045,7 +1071,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1055,11 +1081,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empreu «apt-get autoremove» per a suprimir-los."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1077,43 +1103,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "No s'ha pogut trobar la tasca %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "No s'ha pogut trobar el paquet %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "S'ha marcat %s com instal·lat manualment.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1121,7 +1127,7 @@ msgstr ""
 "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
 "especifiqueu una solució)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1133,124 +1139,149 @@ msgstr ""
 "unstable i alguns paquets requerits encara no han estat creats o bé\n"
 "encara no els hi han afegit."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "S'instal·laran els següents paquets extres:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "No s'ha pogut trobar el paquet %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "S'ha marcat %s com instal·lat manualment.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "S'està calculant l'actualització... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Fet"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "S'ha produït un error intern, el solucionador de problemes ha trencat coses"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Haureu d'especificar un paquet de codi font per a baixar"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obté el font %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "S'ha d'especificar un paquet per a verificar les dependències de construcció "
 "per a"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "No es pot obtenir informació sobre les dependències de construcció per a %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1259,41 +1290,41 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
-"s pot satisfer els requeriments de versions"
+"La dependència %s per a %s no es pot satisfer per que cap versió del paquet "
+"%s pot satisfer els requeriments de versions"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
 "és massa nou"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1318,6 +1349,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1379,7 +1412,7 @@ msgstr ""
 "per a obtenir més informació i opcions.\n"
 "                       Aquest APT té superpoders bovins\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1630,9 +1663,9 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
@@ -1663,10 +1696,9 @@ msgstr ""
 "La info i els directoris temp necessiten estar en el mateix sistema de "
 "fitxers"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "S'està llegint la llista de paquets"
 
@@ -1799,12 +1831,12 @@ msgstr "No s'ha trobat el disc"
 msgid "File not found"
 msgstr "Fitxer no trobat"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "L'estat ha fallat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
 
@@ -1866,7 +1898,7 @@ msgstr "Temps de connexió finalitzat"
 msgid "Server closed the connection"
 msgstr "El servidor ha tancat la connexió"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Error de lectura"
 
@@ -1878,188 +1910,178 @@ msgstr "Una resposta ha desbordat la memòria temporal."
 msgid "Protocol corruption"
 msgstr "Protocol corromput"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Error d'escriptura"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "No s'ha pogut crear un sòcol"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "No s'ha pogut connectar amb el sòcol passiu."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte"
 
 # abastar? huh? jm
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "No s'ha pogut abastar un connector"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "No s'ha pogut escoltar sobre el sòcol"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "No s'ha pogut determinar el nom del sòcol"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "No es pot enviar l'ordre PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "La família d'adreces %u és desconeguda (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "No és possible reprendre el fitxer, el servidor ha dit '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "S'ha esgotat el temps d'espera per al sòcol de dades"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "No es pot invocar"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "S'està connectant amb %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "No es pot iniciar la connexió amb %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No s'ha pogut connectar amb %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "S'està connectant amb %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No s'ha pogut resoldre '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "S'ha produït un error temporal en resoldre '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "No es pot connectar amb %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "S'està avortant la instal·lació."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
-"sortint."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error intern: La signatura és correcta, però no s'ha pogut determinar "
 "l'emprempta digital de la clau!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el "
 "gpgv?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "S'ha produït un error desconegut en executar el gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures següents són invàlides:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2067,16 +2089,6 @@ msgstr ""
 "Les signatures següents no s'han pogut verificar perquè la clau pública no "
 "està disponible:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "No s'ha pogut obrir un conducte per a %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "S'ha produït un error en llegir des del procés %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
@@ -2139,19 +2151,19 @@ msgstr ""
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "No s'ha pogut truncar el fitxer %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Error intern"
 
@@ -2185,14 +2197,19 @@ msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
-"Valor actual: %lu. (man 5 apt.conf)"
+"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
+"Limit. Valor actual: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2219,7 +2236,7 @@ msgstr "limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecció %s"
@@ -2350,153 +2367,170 @@ msgstr "No es pot canviar a %s"
 msgid "Failed to stat the cdrom"
 msgstr "No s'ha pogut fer «stat» del cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No es pot resoldre el fitxer de blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No s'ha pogut blocar %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s però no hi era"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-procés %s ha rebut una violació de segment."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Sub-procés %s ha rebut una violació de segment."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-procés %s ha retornat un codi d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El sub-procés %s ha sortit inesperadament"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "No s'ha pogut obrir el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "No s'ha pogut obrir un conducte per a %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "llegits, falten %lu per llegir, però no queda res"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escrits, falten %lu per escriure però no s'ha pogut"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Ha hagut un problema en tancar el fitxer"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Ha hagut un problema en tancar el fitxer"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Ha hagut un problema en sincronitzar el fitxer"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Ha hagut un problema en desenllaçar el fitxer"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Ha hagut un problema en sincronitzar el fitxer"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Memòria cau de paquets és buida"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "El fitxer de memòria cau de paquets està corromput"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "El fitxer de memòria cau de paquets és una versió incompatible"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Aquest APT no suporta el sistema de versions «%s»"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depèn"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Predepèn"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Suggereix"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recomana"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Entra en conflicte"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Reemplaça"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Fa obsolet"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Trenca"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "requerit"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "estàndard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2526,7 +2560,7 @@ msgstr "No s'ha pogut obrir el fitxer d'estat %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2611,7 +2645,7 @@ msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2663,7 +2697,7 @@ msgstr ""
 "No es poden corregir els problemes, teniu paquets retinguts que estan "
 "trencats."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2713,12 +2747,12 @@ msgstr "El mètode %s no s'ha iniciat correctament"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema d'empaquetament «%s» no està suportat"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
 
@@ -2731,149 +2765,171 @@ msgstr "No es pot veure l'estat de %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Potser voldreu executar apt-get update per a corregir aquests problemes"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "No s'ha entès el pin de tipus %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "No hi ha prioritat especificada per al pin (o és zero)"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "La memòria cau té un sistema de versions incompatible"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "S'ha produït un error durant el processament de %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "S'ha produït un error durant el processament de %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "S'ha produït un error durant el processament de %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de descripcions que aquest APT és capaç de "
 "gestionar. "
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
 "gestionar."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 "S'ha produït un error durant el processament de %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "No s'ha pogut llegir la llista de paquets font %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "S'estan recollint els fitxers que proveeixen"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Error d'E/S en desar la memòria cau de la font"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 no concorda"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, fuzzy, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr "El fitxer Release ha caducat, s'està ignorant %s (vàlid fins a %s)"
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2883,7 +2939,7 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2892,7 +2948,7 @@ msgstr ""
 "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
 "d'arreglar aquest paquet manualment."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2900,25 +2956,35 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "No es pot analitzar el fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "No hi ha seccions al fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "No hi ha una entrada Hash al fitxer Release %s"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "No hi ha una entrada Hash al fitxer Release %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "No hi ha una entrada Hash al fitxer Release %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2971,8 +3037,8 @@ msgstr "S'està analitzant el disc per a fitxers d'índex...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de "
 "traduccions i %zu signatures\n"
@@ -3013,147 +3079,186 @@ msgstr "S'està escrivint una nova llista de fonts\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
 "coincidents\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "S'està obrint el fitxer de configuració %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "S'està instal·lant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "S'està configurant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "S'està suprimint el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "S'està executant l'activador de postinstal·lació %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "No s'ha pogut obrir el fitxer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "S'està preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'està desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "S'està preparant per a configurar el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "S'ha instal·lat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "S'està preparant per a la supressió del paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "S'està preparant per a suprimir completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
 "pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "No es pot blocar el directori de la llista"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "No blocat"
 
@@ -3171,10 +3276,33 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "No s'ha trobat la versió «%s» per a «%s»"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "No s'ha pogut trobar la tasca %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
+#~ "sortint."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "No s'ha pogut obrir un conducte per a %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "S'ha produït un error en llegir des del procés %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr ""
 #~ "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
@@ -3200,12 +3328,6 @@ msgstr "La connexió s'ha tancat prematurament"
 #~ msgid "Dynamic MMap ran out of room"
 #~ msgstr "L'MMap dinàmic s'ha quedat sense espai"
 
-#~ msgid "Release file expired, ignoring %s (valid until %s)"
-#~ msgstr "El fitxer Release ha caducat, s'està ignorant %s (vàlid fins a %s)"
-
-#~ msgid "Conflicting distribution: %s (expected %s but got %s)"
-#~ msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
-
 #~ msgid ""
 #~ "Since you only requested a single operation it is extremely likely that\n"
 #~ "the package is simply not installable and a bug report against\n"
diff --git a/po/cs.po b/po/cs.po
index f5e8cae48..700ea3a42 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,155 +7,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-16 18:05+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Balík %s verze %s má nesplněné závislosti:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nemohu najít balík %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Celkem názvů balíků: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Celkem názvů balíků: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normálních balíků: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Čistě virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Smíšených virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Chybějících: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Celkem různých verzí: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Celkem různých popisů: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Celkem závislostí: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Celkem vztahů ver/soubor: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Celkem vztahů popis/soubor: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Celkem poskytnutých mapování: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Celkem globovaných řetězců: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Celkem místa závislých verzí: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Celkem jalového místa: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Celkem přiřazeného místa: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Soubor balíku %s je špatně synchronizovaný."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Musíte zadat právě jeden vzor"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nebyly nalezeny žádné balíky"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nemohu najít balík %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Soubory balíku:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Vypíchnuté balíky:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nenalezeno)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalovaná verze: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(žádná)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Vypíchnutý balík: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pro %s zkompilován na %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -176,6 +177,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -307,12 +309,12 @@ msgstr ""
 "  -c=? Načte tento konfigurační soubor\n"
 "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nemohu zapsat do %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nemohu určit verzi programu debconf. Je debconf nainstalován?"
 
@@ -647,79 +649,79 @@ msgstr "Problém s odlinkováním %s"
 msgid "Failed to rename %s to %s"
 msgstr "Selhalo přejmenování %s na %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba při kompilaci regulárního výrazu - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Následující balíky mají nesplněné závislosti:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s je nainstalován"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s se bude instalovat"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ale nedá se nainstalovat"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ale je to virtuální balík"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ale není nainstalovaný"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ale nebude se instalovat"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " nebo"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Následující NOVÉ balíky budou nainstalovány:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Následující balíky budou ODSTRANĚNY:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Následující balíky jsou podrženy v aktuální verzi:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Následující balíky budou aktualizovány:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Následující balíky budou DEGRADOVÁNY:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Následující podržené balíky budou změněny:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvůli %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,141 +729,234 @@ msgstr ""
 "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
 "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizováno, %lu nově instalováno, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalováno, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradováno, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu k odstranění a %lu neaktualizováno.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vybraná verze %s (%s) pro %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Balík %s je virtuální balík poskytovaný:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr "[Instalovaný]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Kandidátské verze"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Měli byste explicitně vybrat jeden k instalaci."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Balík %s není dostupný, ale jiný balík se na něj odkazuje.\n"
+"To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
+"pouze z jiného zdroje\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Nicméně následující balíky jej nahrazují:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Balík %s nemá kandidáta pro instalaci"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Pozn: Vybírám %s místo %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Přeskakuji %s, protože je již nainstalován.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Přeskakuji %s, protože je již nainstalován.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s je již nejnovější verze.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s nastaven jako instalovaný ručně.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Opravuji závislosti..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " selhalo."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Nemohu opravit závislosti"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Nemohu minimalizovat sadu pro aktualizaci"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Hotovo"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Pro opravení můžete spustit „apt-get -f install“."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nesplněné závislosti. Zkuste použít -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Autentizační varování potlačeno.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalovat tyto balíky bez ověření [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Některé balíky nemohly být autentizovány"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB archivů.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po této operaci bude na disku použito dalších %sB.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po této operaci bude na disku uvolněno %sB.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nemohu určit volné místo v %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "V %s nemáte dostatek volného místa."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ano, udělej to tak, jak říkám!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -872,28 +967,28 @@ msgstr ""
 "Pro pokračování opište frázi „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Přerušeno."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovat [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo stažení %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Stahování dokončeno v režimu pouze stáhnout"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -901,126 +996,57 @@ msgstr ""
 "Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
 "fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Nemohu opravit chybějící balíky."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Přerušuji instalaci."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Pozn: Vybírám %s místo %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Přeskakuji %s, protože je již nainstalován.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Přeskakuji %s, protože je již nainstalován.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Balík %s je virtuální balík poskytovaný:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr "[Instalovaný]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Kandidátské verze"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Měli byste explicitně vybrat jeden k instalaci."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Balík %s není dostupný, ale jiný balík se na něj odkazuje.\n"
-"To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
-"pouze z jiného zdroje\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Nicméně následující balíky jej nahrazují:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Balík %s nemá kandidáta pro instalaci"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s je již nejnovější verze.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Vybraná verze %s (%s) pro %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1032,7 +1058,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1042,11 +1068,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1064,43 +1090,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Nemohu najít úlohu %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Nemohu najít balík %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s nastaven jako instalovaný ručně.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1108,7 +1114,7 @@ msgstr ""
 "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
 "navrhněte řešení)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1119,128 +1125,153 @@ msgstr ""
 "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
 "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nemohu najít balík %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s nastaven jako instalovaný ručně.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Propočítávám aktualizaci... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Nemohu zamknout adresář pro stahování"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nemohu najít zdrojový balík pro %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Přeskakuji dříve stažený soubor „%s“\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatek volného místa"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stáhnout zdroj %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
 "pro sestavení"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nemohu získat závislosti pro sestavení %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1249,31 +1280,31 @@ msgstr ""
 "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
 "%s, která odpovídá požadavku na verzi"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Selhalo splnění %s závislosti pro %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti pro sestavení %s nemohly být splněny."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1298,6 +1329,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1357,7 +1390,7 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tato APT má schopnosti svaté krávy.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1603,9 +1636,9 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nemohu číst %s"
@@ -1634,10 +1667,9 @@ msgstr "Selhalo vyhodnocení %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Adresáře info a temp musí být na stejném souborovém systému"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Čtu seznamy balíků"
 
@@ -1770,12 +1802,12 @@ msgstr "Disk nebyl nalezen."
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Selhalo vyhodnocení"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Nelze nastavit čas modifikace"
 
@@ -1837,7 +1869,7 @@ msgstr "Čas spojení vypršel"
 msgid "Server closed the connection"
 msgstr "Server uzavřel spojení"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Chyba čtení"
 
@@ -1849,182 +1881,174 @@ msgstr "Odpověď přeplnila buffer."
 msgid "Protocol corruption"
 msgstr "Porušení protokolu"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Chyba zápisu"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Nemohu vytvořit socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nemohu připojit datový socket, čas spojení vypršel"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Nemohu připojit pasivní socket."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal naslouchající socket"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Nemohu navázat socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Nemohu naslouchat na socketu"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Nemohu určit jméno socketu"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Nemohu odeslat příkaz PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznámá rodina adres %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT selhal, server řekl: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Spojení datového socketu vypršelo"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Nemohu přijmout spojení"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nemohu stáhnout soubor, server řekl „%s“"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Datový socket vypršel"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Přenos dat selhal, server řekl „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Nemohu vyvolat "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Připojuji se k %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nemohu vytvořit socket pro %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nemohu navázat spojení na %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nemohu se připojit k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Připojuji se k %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nemohu zjistit „%s“"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Dočasné selhání při zjišťování „%s“"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nemohu se připojit k %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Přerušuji instalaci."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Neznámá chyba při spouštění gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Následující podpisy jsou neplatné:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2032,16 +2056,6 @@ msgstr ""
 "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný "
 "klíč:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Nemohu otevřít rouru pro %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Chyba čtení z procesu %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Čekám na hlavičky"
@@ -2103,19 +2117,19 @@ msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Nelze zmenšit soubor"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
@@ -2150,11 +2164,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2181,7 +2200,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Výběr %s nenalezen"
@@ -2314,152 +2333,169 @@ msgstr "Nemohu přejít do %s"
 msgid "Failed to stat the cdrom"
 msgstr "Nezdařilo se vyhodnotit cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nešlo otevřít zámkový soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nemohu získat zámek %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čekal jsem na %s, ale nebyl tam"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržel chybu segmentace."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s obdržel chybu segmentace."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrátil chybový kód (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočekávaně skončil"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nemohu otevřít soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nemohu otevřít rouru pro %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "zápis, stále mám %lu k zápisu, ale nejde to"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problém při zavírání souboru"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problém při zavírání souboru"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problém při synchronizování souboru"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problém při odstraňování souboru"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problém při synchronizování souboru"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Cache balíků je prázdná"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Cache soubor balíků je poškozen"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Cache soubor balíků je v nekompatibilní verzi"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tato APT nepodporuje systém pro správu verzí „%s“"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Cache balíků byla vytvořena pro jinou architekturu"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Předzávisí na"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Doporučuje"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Nahrazuje"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Zastarává"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Porušuje"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "důležitý"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "vyžadovaný"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standardní"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "volitelný"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2489,7 +2525,7 @@ msgstr "Nelze otevřít stavový soubor %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nelze zapsat dočasný stavový soubor %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2574,7 +2610,7 @@ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2622,7 +2658,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2672,12 +2708,12 @@ msgstr "Metoda %s nebyla spuštěna správně"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Balíčkovací systém „%s“ není podporován"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
 
@@ -2690,140 +2726,162 @@ msgstr "Nebylo možno vyhodnotit %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadat „zdrojové“ URI"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nerozumím vypíchnutí typu %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache má nekompatibilní systém správy verzí"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Při zpracování %s se objevila chyba (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Při zpracování %s se objevila chyba (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Při zpracování %s se objevila chyba (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Při zpracování %s se objevila chyba (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Wow, překročili jste počet jmen balíků, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, překročili jste počet verzí, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Chyba při zpracování %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Chyba IO při ukládání zdrojové cache"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "přejmenování selhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Neshoda MD5 součtů"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Neshoda kontrolních součtů"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2832,7 +2890,7 @@ msgstr ""
 "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
 "tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2841,32 +2899,42 @@ msgstr ""
 "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
 "opravit ručně."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nelze zpracovat soubor %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Pozn: Vybírám %s místo %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neplatná řádka v diverzním souboru: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nelze zpracovat soubor %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2919,8 +2987,8 @@ msgstr "Hledám na disku indexové soubory...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Nalezl jsem indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a "
 "podpisy (%zu)\n"
@@ -2961,144 +3029,183 @@ msgstr "Zapisuji nový seznam balíků\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Seznamy zdrojů na tomto disku jsou:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapsal jsem %i záznamů.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Otevírám konfigurační soubor %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Neshoda kontrolních součtů"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Instaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Kompletně odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Spouštím poinstalační spouštěč %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresář „%s“ chybí"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nemohu otevřít soubor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Připravuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Připravuji nastavení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Nainstalován %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Připravuji odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Připravuji úplné odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nemohu uzamknout list adresář"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3116,10 +3223,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Spojení bylo předčasně ukončeno"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Nemohu najít úlohu %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nemohu otevřít rouru pro %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Chyba čtení z procesu %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
 
@@ -3166,8 +3295,8 @@ msgstr "Spojení bylo předčasně ukončeno"
 #~ msgstr "Uložený název: %s \n"
 
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i), indexy překladů (%i) "
 #~ "a podpisy (%i)\n"
diff --git a/po/cy.po b/po/cy.po
index ed60779d8..a369a4988 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,174 +6,174 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ni ellir lleoli'r pecyn %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 #, fuzzy
 msgid "Total package names: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 #, fuzzy
 msgid "  Normal packages: "
 msgstr "  Pecynnau Normal: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "  Pure virtual packages: "
 msgstr "  Pecynnau Cwbl Rhithwir: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 #, fuzzy
 msgid "  Single virtual packages: "
 msgstr "  Pecynnau Rhithwir Sengl: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 #, fuzzy
 msgid "  Mixed virtual packages: "
 msgstr "  Pecynnau Rhithwir Cymysg: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 #, fuzzy
 msgid "Total distinct versions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total dependencies: "
 msgstr "Cyfanswm Dibyniaethau: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 #, fuzzy
 msgid "Total ver/file relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Cyfanswm Mapiau Darpariath: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 #, fuzzy
 msgid "Total globbed strings: "
 msgstr "Cyfanswm Llinynau Glob: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 #, fuzzy
 msgid "Total dependency version space: "
 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Cyfanswm gofod Slac: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 #, fuzzy
 msgid "Total space accounted for: "
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"
+
+#: cmdline/apt-cache.cc:1533
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(dim)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -195,6 +195,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -333,12 +334,12 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad hwn\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni ellir ysgrifennu i %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
 
@@ -675,82 +676,82 @@ msgstr "Gwall wrth datgysylltu %s"
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ond mae %s wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ond ni ellir ei sefydlu"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ond mae'n becyn rhithwir"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ond nid yw wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ond nid yw'n mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " neu"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 #, fuzzy
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -760,144 +761,239 @@ msgstr ""
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu wedi ailsefydlu, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu wedi eu israddio, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Sefydliwyd]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Fersiynau Posib"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+
+# FIXME: punctuation
+#: cmdline/apt-get.cc:682
+#, fuzzy, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
+"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
+"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
+"ffeil sources.list.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " wedi methu."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni ellir bychanu y set uwchraddio"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Wedi Gorffen"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 #, fuzzy
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -908,29 +1004,29 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Erthylu."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -938,129 +1034,58 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Sefydliwyd]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Fersiynau Posib"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Dylech ddewis un yn benodol i'w sefydlu."
-
-# FIXME: punctuation
-#: cmdline/apt-get.cc:1175
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
-"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
-"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
-"ffeil sources.list.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1070,7 +1095,7 @@ msgid_plural ""
 msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1078,11 +1103,11 @@ msgid_plural ""
 msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1098,46 +1123,26 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Methwyd canfod pecyn %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Methwyd canfod pecyn %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
 
 # FIXME
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1146,7 +1151,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1158,131 +1163,156 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc:2002
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Methwyd"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
-"s"
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1291,34 +1321,34 @@ msgstr ""
 "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
 "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1343,6 +1373,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1403,7 +1435,7 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1658,9 +1690,9 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
@@ -1689,10 +1721,9 @@ msgstr "Methwyd stat() ar %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 #, fuzzy
 msgid "Reading package lists"
 msgstr "Yn Darllen Rhestrau Pecynnau"
@@ -1839,12 +1870,12 @@ msgstr "Ffeil heb ei ganfod"
 msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 
@@ -1907,7 +1938,7 @@ msgstr "Goramser cysylltu"
 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Gwall darllen"
 
@@ -1919,200 +1950,181 @@ msgstr "Gorlifodd ateb y byffer."
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Gwall ysgrifennu"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Methwyd creu soced"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 #, fuzzy
 msgid "Could not connect passive socket."
 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Methodd getaddrinfo gael soced gwrando"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Methwyd rhwymo soced"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Methwyd gwrando ar y soced"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Methwyd canfod enw'r soced"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Methwyd danfod gorchymyn PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Goramserodd cysylltiad y soced data"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Goramserodd soced data"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Methwyd cysylltu i %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yn cysylltu i %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Methwyd datrys '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Methwyd cysylltu i %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Methwyd agor pibell ar gyfer %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Gwall darllen o broses %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
@@ -2179,21 +2191,21 @@ msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
@@ -2229,11 +2241,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2260,7 +2277,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
@@ -2396,155 +2413,172 @@ msgstr "Ni ellir newid i %s"
 msgid "Failed to stat the cdrom"
 msgstr "Methwyd gwneud stat() o'r CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Methwyd agor y ffeil clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Methwyd cael y clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Gorffenodd is-broses %s yn annisgwyl"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "o hyd %lu i ysgrifennu ond methwyd"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Gwall wrth gyfamseru'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
 # FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, fuzzy, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Dibynnu"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "CynDdibynnu"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Awgrymu"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Argymell"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Gwrthdaro"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Amnewid"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Darfodi"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "pwysig"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "angenrheidiol"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "safonnol"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opsiynnol"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "ychwanegol"
 
@@ -2578,7 +2612,7 @@ msgstr "Methwyd agor %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2669,7 +2703,7 @@ msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2721,7 +2755,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2774,12 +2808,12 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
@@ -2794,146 +2828,168 @@ msgstr "Ni ellir gwneud stat() o %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
 
 # FIXME: literal
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Methwyd daeall y math pin %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Mae can y storfa system fersiwn anghyfaddas"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Yn Casglu Darpariaethau Ffeil"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
 # FIXME: case
-#: apt-pkg/acquire-item.cc:1260
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2942,7 +2998,7 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2951,33 +3007,44 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
 # FIXME: number?
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -3030,8 +3097,8 @@ msgstr ""
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:677
@@ -3070,143 +3137,182 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3224,10 +3330,30 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Methwyd canfod pecyn %s"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Methwyd agor pibell ar gyfer %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Gwall darllen o broses %s"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
+
 #, fuzzy
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
diff --git a/po/da.po b/po/da.po
index 88dea615a..0540fc76e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,159 +9,159 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2007-09-06 21:40+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "<Pakken %s version %s har en uopfyldt afhængighed:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kunne ikke lokalisere pakken %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Totale pakkenavne : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Totale pakkenavne : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normale pakker: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Rene virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Enkelte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Blandede virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Manglende: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Totale forskellige versioner: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Sammenlagt forskellige beskrivelser: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Sammenlagt afhængigheder: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Sammenlagt 'Tilbyder'-markeringer: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Totalle søgemønsterstrenge: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Total afhængighedsversions-plads: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Total 'Slack'-plads: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Total plads, der kan gøres rede for: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefilen %s er ude af trit."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
-msgstr "Du skal angive nøjagtig ét mønster"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
+msgstr "Du skal angive mindst ét filnavn"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Fandt ingen pakker"
 
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kunne ikke lokalisere pakken %s"
+
 # Overskriften til apt-cache policy,
 # forkorter "Package" væk. CH
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "'Pinned' pakker:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(ikke fundet)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installeret: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pakke-pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versionstabel:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s oversat %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -183,6 +183,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -315,12 +316,12 @@ msgstr ""
 "  -c=? Læs denne opsætningsfil\n"
 "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kunne ikke skrive til %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
 
@@ -656,79 +657,79 @@ msgstr "Problem under afl
 msgid "Failed to rename %s to %s"
 msgstr "Kunne ikke omdøbe %s til %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regulært udtryk - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgende pakker har uopfyldte afhængigheder:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installeret"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s forventes installeret"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "men den kan ikke installeres"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "men det er en virtuel pakke"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "men den er ikke installeret"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "men den bliver ikke installeret"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil blive AFINSTALLERET:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er blevet holdt tilbage:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil blive opgraderet:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil blive NEDGRADERET:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Følgende tilbageholdte pakker vil blive ændret:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (grundet %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -736,140 +737,237 @@ msgstr ""
 "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
 "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu opgraderes, %lu nyinstalleres, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geninstalleres, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderes, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valgte version %s (%s) af %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installeret]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Kandidatversioner"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Du bør eksplicit vælge en at installere."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Pakken %s har ingen tilgængelig version, men der refereres til den i en \n"
+"anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
+"kun kan hentes fra andre kilder\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Dog kan følgende pakker erstatte den:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakken %s har ingen installationskandidat"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Bemærk, at %s vælges fremfor %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Overspringer %s, da den allerede er installeret og opgradering er "
+"deaktiveret.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Overspringer %s, da den allerede er installeret og opgradering er "
+"deaktiveret.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s er i forvejen den nyeste version.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s sat til manuelt installeret.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Retter afhængigheder..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " mislykkedes."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Kunne ikke rette afhængigheder"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunne ikke minimere opgraderingssættet"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Færdig"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uopfyldte afhængigheder. Prøv med -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Autentifikationsadvarsel tilsidesat.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installér disse pakker uden verifikation (y/N)? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Nogle pakker kunne ikke autentificeres"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Der er problemer og -y blev brugt uden --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldført"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke læses."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sB/%sB skal hentes fra arkiverne.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB skal hentes fra arkiverne.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Efter udpakning vil %sB yderligere diskplads være brugt.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikke nok ledig plads i %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ja, gør som jeg siger!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -880,28 +978,28 @@ msgstr ""
 "For at fortsætte, skal du skrive '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Afbryder."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsætte [J/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -909,132 +1007,59 @@ msgstr ""
 "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' "
 "eller prøv med --fix-missing."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing og medieskift understøttes endnu ikke"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Kunne ikke rette manglende pakker."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Afbryder installationen."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Bemærk, at %s vælges fremfor %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Overspringer %s, da den allerede er installeret og opgradering er "
-"deaktiveret.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Overspringer %s, da den allerede er installeret og opgradering er "
-"deaktiveret.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Installeret]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Kandidatversioner"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Du bør eksplicit vælge en at installere."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Pakken %s har ingen tilgængelig version, men der refereres til den i en \n"
-"anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
-"kun kan hentes fra andre kilder\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Dog kan følgende pakker erstatte den:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Pakken %s har ingen installationskandidat"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s er i forvejen den nyeste version.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Udgaven '%s' for '%s' blev ikke fundet"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versionen '%s' for '%s' blev ikke fundet"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Valgte version %s (%s) af %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Kunne ikke finde kildepakkelisten %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "'update'-kommandoen benytter ingen parametre"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
 "AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1046,7 +1071,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1056,11 +1081,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Brug 'apt-get autoremove' til at fjerne dem."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1078,43 +1103,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover ødelagde noget"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern fejl, AllUpgrade ødelagde noget"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Kunne ikke finde opgaven %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Kunne ikke finde pakken %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s sat til manuelt installeret.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1122,7 +1127,7 @@ msgstr ""
 "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
 "en løsning)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1133,119 +1138,144 @@ msgstr ""
 "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
 "pakker endnu ikke er lavet eller gjort tilgængelige."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Følgende yderligere pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Foreslåede pakker:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Kunne ikke finde pakken %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s sat til manuelt installeret.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Færdig"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemløseren ødelagde noget"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke låse nedhentningsmappen"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plads i %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhængigheder.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1253,7 +1283,7 @@ msgid ""
 msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1262,32 +1292,32 @@ msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige "
 "udgaver af pakken %s kan tilfredsstille versions-kravene"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
 "ny"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1312,6 +1342,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1371,7 +1403,7 @@ msgstr ""
 "for flere oplysninger og tilvalg.\n"
 "                       Denne APT har \"Super Cow Powers\".\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1622,9 +1654,9 @@ msgstr "File %s/%s overskriver filen i pakken %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunne ikke læse %s"
@@ -1653,10 +1685,9 @@ msgstr "Kunne ikke finde %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Mapperne info og temp skal ligge i samme filsystem"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Indlæser pakkelisterne"
 
@@ -1791,12 +1822,12 @@ msgstr "Disk blev ikke fundet."
 msgid "File not found"
 msgstr "Fil blev ikke fundet"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Kunne ikke finde"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Kunne ikke angive ændringstidspunkt"
 
@@ -1858,7 +1889,7 @@ msgstr "Tidsudl
 msgid "Server closed the connection"
 msgstr "Serveren lukkede forbindelsen"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Læsefejl"
 
@@ -1870,183 +1901,175 @@ msgstr "Mellemlageret blev overfyldt af et svar."
 msgid "Protocol corruption"
 msgstr "Protokolfejl"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivefejl"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Kunne ikke oprette sokkel"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Kunne ikke forbinde passiv sokkel."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunne ikke få en lyttesokkel"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Kunne ikke tilknytte en sokkel"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Kunne ikke lytte på soklen"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Kunne ikke finde soklens navn"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Kunne ikke sende PORT-kommando"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukendt adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Tidsudløb på datasokkel-forbindelse"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunne ikke hente fil. Serveren sagde '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Tidsudløb ved datasokkel"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Forespørgsel"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Kunne ikke udføre "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Forbinder til %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunne ikke forbinde til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Forbinder til %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunne ikke omsætte navnet '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Der skete noget underligt under navneomsætning af '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunne ikke forbinde til %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Afbryder installationen."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Stødte på mindst én ugyldig signatur."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunne ikke køre '%s' for at verificere signaturen (er gpgv installeret?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved kørsel af gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Følgende signaturer var ugyldige:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2054,16 +2077,6 @@ msgstr ""
 "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
 "tilgængelig:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Kunne ikke åbne datarør for %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Læsefejl fra %s-process"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
@@ -2126,20 +2139,20 @@ msgstr "Fejl ved l
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Kunne ikke skrive filen %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Intern fejl"
 
@@ -2174,11 +2187,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2205,7 +2223,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Det valgte %s blev ikke fundet"
@@ -2336,152 +2354,169 @@ msgstr "Kunne ikke skifte til %s"
 msgid "Failed to stat the cdrom"
 msgstr "Kunne ikke finde cdrommen"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunne ikke åbne låsefilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Benytter ikke låsning for nfs-monteret låsefil %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunne ikke opnå låsen %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventede på %s, men den var der ikke"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s modtog en segmenteringsfejl."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s modtog en segmenteringsfejl."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s returnerede en fejlkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s afsluttedes uventet"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunne ikke åbne filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Kunne ikke åbne datarør for %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "læs, mangler stadig at læse %lu men der er ikke flere"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem under lukning af fil"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Problem under lukning af fil"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem under synkronisering af fil"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Fejl ved frigivelse af filen"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problem under synkronisering af fil"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Tomt pakke-mellemlager"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Pakke-mellemlagerets fil er ødelagt"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT understøtter ikke versionssystemet '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Afhængigheder"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Præ-afhængigheder"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Foreslåede"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Anbefalede"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Overflødiggør"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Ødelægger"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "vigtig"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "krævet"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "frivillig"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "ekstra"
 
@@ -2511,7 +2546,7 @@ msgstr "Kunne ikke 
 msgid "Failed to write temporary StateFile %s"
 msgstr "Kunne ikke skrive den midlertidige StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, fuzzy, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr "Intern fejl. Kunne ikke tolke pakkeindgangen"
@@ -2596,7 +2631,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2647,7 +2682,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2697,12 +2732,12 @@ msgstr "Metoden %s startede ikke korrekt"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet '%s' understøttes ikke"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunne ikke bestemme en passende pakkesystemtype"
 
@@ -2715,143 +2750,165 @@ msgstr "Kunne ikke finde %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du skal have nogle 'source'-URI'er i din sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan muligvis rette problemet ved at køre 'apt-get update'"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Kunne ikke forstå pin-type %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunne ikke finde kildepakkelisten %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Samler filudbud"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO-fejl ved gemning af kilde-mellemlageret"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "omdøbning mislykkedes, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2860,7 +2917,7 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2869,31 +2926,41 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "nødt til manuelt at reparere denne pakke."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Størrelsen stemmer ikke"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kunne ikke tolke pakkefilen %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Bemærk, at %s vælges fremfor %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i omrokeringsfilen: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Kunne ikke tolke pakkefilen %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2946,8 +3013,8 @@ msgstr "Skanner disken for indeksfiler..\n"
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Fandt %i pakkeindekser, %i kildeindekser, %i oversættelsesindekser og %i "
 "signaturer\n"
@@ -2989,143 +3056,182 @@ msgstr "Skriver ny kildeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Denne disk har følgende kildeliste-indgange:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i ikke-trufne filer\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Åbner konfigurationsfilen %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Sætter %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listemappen %spartial mangler."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunne ikke åbne filen %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Klargør %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker %s ud"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Gør klar til at sætte %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Gør klar til afinstallation af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Gør klar til at fjerne %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kunne ikke låse listemappen"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3143,10 +3249,35 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen lukkedes for hurtigt"
 
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "Du skal angive nøjagtig ét mønster"
+
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Udgaven '%s' for '%s' blev ikke fundet"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Versionen '%s' for '%s' blev ikke fundet"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Kunne ikke finde opgaven %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Kunne ikke åbne datarør for %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Læsefejl fra %s-process"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
 
@@ -3197,8 +3328,8 @@ msgstr "Forbindelsen lukkedes for hurtigt"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Fandt %i pakkeindekser, %i kildeindekser, %i oversættelsesindekser og %i "
 #~ "signaturer\n"
@@ -3278,9 +3409,6 @@ msgstr "Forbindelsen lukkedes for hurtigt"
 #~ msgid "Unimplemented"
 #~ msgstr "Ikke implementeret"
 
-#~ msgid "You must give at least one file name"
-#~ msgstr "Du skal angive mindst ét filnavn"
-
 #~ msgid "Generating cache"
 #~ msgstr "Opretter mellemlager"
 
diff --git a/po/de.po b/po/de.po
index fd101db23..39875ab66 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,156 +10,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2010-02-27 13:17+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);>\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s Version %s hat eine nicht erfüllte Abhängigkeit:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Paket %s kann nicht gefunden werden"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Gesamtzahl an Paketnamen: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Gesamtzahl an Paketnamen: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  davon gewöhnliche Pakete: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  davon rein virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  davon einzelne virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  davon gemischte virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  davon fehlend: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Gesamtzahl an unterschiedlichen Versionen: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Gesamtzahl an Abhängigkeiten: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Gesamtzahl an Bereitstellungen: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Gesamtzahl an Mustern: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Gesamtmenge an Slack: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Gesamtmenge an Speicher: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketdatei %s ist nicht synchronisiert."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Sie müssen genau ein Muster angeben"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Keine Pakete gefunden"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Paket %s kann nicht gefunden werden"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Paketdateien:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache ist nicht synchron, Querverweisen einer Paketdatei nicht möglich"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Mit Pinning verwaltete Pakete:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nicht gefunden)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installiert: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(keine)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Paket-Pinning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s für %s, kompiliert am %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -180,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -317,12 +319,12 @@ msgstr ""
 "  -c=?  Diese Konfigurationsdatei lesen\n"
 "  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Schreiben nach %s nicht möglich"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
@@ -667,80 +669,80 @@ msgstr "Problem beim Entfernen (unlink) von %s"
 msgid "Failed to rename %s to %s"
 msgstr "%s konnte nicht in %s umbenannt werden"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Die folgenden Pakete haben nicht erfüllte Abhängigkeiten:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "aber %s ist installiert"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "aber %s soll installiert werden"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ist aber nicht installierbar"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ist aber ein virtuelles Paket"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ist aber nicht installiert"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "soll aber nicht installiert werden"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " oder"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Die folgenden NEUEN Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Die folgenden Pakete werden ENTFERNT:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Die folgenden Pakete sind zurückgehalten worden:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 "Die folgenden Pakete werden DEAKTUALISIERT (ältere Version wird installiert):"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Die folgenden gehaltenen Pakete werden verändert:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (wegen %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -748,142 +750,241 @@ msgstr ""
 "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
 "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualisiert, %lu neu installiert, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu erneut installiert, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu deaktualisiert, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nicht vollständig installiert oder entfernt.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt.\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt.\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Gewählte Version %s (%s) für %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installiert]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Mögliche Versionen"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Sie sollten eines explizit zum Installieren auswählen."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Paket %s ist nicht verfügbar, wird aber von einem anderen Paket\n"
+"referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
+"ist oder nur aus einer anderen Quelle verfügbar ist.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Doch die folgenden Pakete ersetzen es:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Paket %s hat keinen Installationskandidaten"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Hinweis: %s wird an Stelle von %s gewählt\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s wird übersprungen; es ist schon installiert und »upgrade« ist nicht "
+"gesetzt.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s wird übersprungen; es ist schon installiert und »upgrade« ist nicht "
+"gesetzt.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"Erneute Installation von %s ist nicht möglich,\n"
+"es kann nicht heruntergeladen werden.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ist schon die neueste Version.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s wurde als manuell installiert festgelegt.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Abhängigkeiten werden korrigiert..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Abhängigkeiten konnten nicht korrigiert werden"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Fertig"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nicht-erfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Authentifizierungswarnung überstimmt.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Einige Pakete konnten nicht authentifiziert werden"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie "
 "eine E-Mail an apt@packages.debian.org (auf Englisch bitte)."
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Es müssen noch %s B von %s B an Archiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Es müssen %s B an Archiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Nach dieser Operation werden %s B Plattenplatz zusätzlich benutzt.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %s B Plattenplatz freigegeben.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Freier Platz in %s konnte nicht bestimmt werden"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Sie haben nicht genug Platz in %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ja, tue was ich sage!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -894,28 +995,28 @@ msgstr ""
 "Zum Fortfahren geben Sie bitte »%s« ein.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abbruch."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Möchten Sie fortfahren [J/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Fehlschlag beim Holen von %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -923,133 +1024,58 @@ msgstr ""
 "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
 "update« ausführen oder mit »--fix-missing« probieren?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Fehlende Pakete konnten nicht korrigiert werden."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Installation abgebrochen."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Hinweis: %s wird an Stelle von %s gewählt\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"%s wird übersprungen; es ist schon installiert und »upgrade« ist nicht "
-"gesetzt.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s wird übersprungen; es ist schon installiert und »upgrade« ist nicht "
-"gesetzt.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Installiert]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Mögliche Versionen"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Sie sollten eines explizit zum Installieren auswählen."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Paket %s ist nicht verfügbar, wird aber von einem anderen Paket\n"
-"referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
-"ist oder nur aus einer anderen Quelle verfügbar ist.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Doch die folgenden Pakete ersetzen es:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Paket %s hat keinen Installationskandidaten"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
-"Erneute Installation von %s ist nicht möglich,\n"
-"es kann nicht heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ist schon die neueste Version.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
-
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Gewählte Version %s (%s) für %s\n"
-
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Als Quellpaket wird »%s« statt »%s« gewählt\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« akzeptiert keine Argumente"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1063,7 +1089,7 @@ msgstr[1] ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
 "benötigt:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1073,11 +1099,11 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1096,52 +1122,32 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat etwas beschädigt"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Task %s konnte nicht gefunden werden"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Paket %s konnte nicht gefunden werden"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt.\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s wurde als manuell installiert festgelegt.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe "
-"eines Pakets (oder geben Sie eine Lösung an)."
+"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
+"Angabe eines Pakets (oder geben Sie eine Lösung an)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1153,125 +1159,150 @@ msgstr ""
 "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n"
 "nicht erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Beschädigte Pakete"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Paket %s konnte nicht gefunden werden"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s wurde als manuell installiert festgelegt.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Fertig"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
 "sollen"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Quellpaket für %s kann nicht gefunden werden"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Sie haben nicht genügend freien Speicherplatz in %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 "Es müssen noch %s B von %s B an Quellarchiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es müssen %s B an Quellarchiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Quelle %s wird heruntergeladen.\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Einige Archive konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten "
 "überprüft werden sollen."
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden."
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bauabhängigkeiten.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1280,7 +1311,7 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1289,32 +1320,33 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
 "Version des Pakets %s die Versionsanforderungen erfüllen kann."
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s "
 "ist zu neu."
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1338,6 +1370,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1403,7 +1437,7 @@ msgstr ""
 "weitergehende Informationen und Optionen.\n"
 "                                    Dieses APT hat Super-Kuh-Kräfte.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1657,9 +1691,9 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s kann nicht gelesen werden"
@@ -1689,10 +1723,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Die »info«- und »temp«-Verzeichnisse müssen in demselben Dateisystem liegen"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Paketlisten werden gelesen"
 
@@ -1717,9 +1750,9 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"Öffnen der Listendatei »%sinfo/%s« fehlgeschlagen. Wenn Sie diese Datei nicht "
-"wiederherstellen können, dann leeren Sie sie und installieren Sie sofort "
-"dieselbe Version des Paketes erneut!"
+"Öffnen der Listendatei »%sinfo/%s« fehlgeschlagen. Wenn Sie diese Datei "
+"nicht wiederherstellen können, dann leeren Sie sie und installieren Sie "
+"sofort dieselbe Version des Paketes erneut!"
 
 #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
 #, c-format
@@ -1829,12 +1862,12 @@ msgid "File not found"
 msgstr "Datei nicht gefunden"
 
 # looks like someone hardcoded English grammar
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "»stat« konnte nicht ausgeführt werden"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Änderungszeitpunkt kann nicht gesetzt werden"
 
@@ -1896,7 +1929,7 @@ msgstr "Zeitüberschreitung der Verbindung"
 msgid "Server closed the connection"
 msgstr "Verbindung durch Server geschlossen"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lesefehler"
 
@@ -1908,189 +1941,181 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht."
 msgid "Protocol corruption"
 msgstr "Protokoll beschädigt"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Socket konnte nicht erzeugt werden"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Passiver Socket konnte nicht verbunden werden."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket "
 "gefunden"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Verbindung des Sockets nicht möglich"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Warten auf Verbindungen auf dem Socket nicht möglich"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Name des Sockets konnte nicht bestimmt werden"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "PORT-Befehl konnte nicht gesendet werden"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Unbekannte Adressfamilie %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Befehl EPRT fehlgeschlagen: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Zeitüberschreitung bei Datenverbindung"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Abfrage"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Aufruf nicht möglich: "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Verbindung mit %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine "
 "Zeitüberschreitung trat auf"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Verbindung mit %s:%s nicht möglich (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbindung mit %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "»%s« konnte nicht aufgelöst werden"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Verbindung mit %s:%s nicht möglich:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Kein Schlüsselring in %s installiert."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr "F: Zu viele Schlüsselringe sollten an gpgv übergeben werden. Abbruch."
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "F: Argumentenliste von Acquire::gpgv::Options zu lang. Abbruch."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte "
 "jedoch nicht ermittelt werden?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "»%s« zur Überprüfung der Signatur konnte nicht ausgeführt werden (ist gpgv "
 "installiert?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Unbekannter Fehler beim Ausführen von gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden Signaturen waren ungültig:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2099,16 +2124,6 @@ msgstr ""
 "öffentlicher\n"
 "Schlüssel nicht verfügbar ist:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Lesefehler von Prozess %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Warten auf Kopfzeilen"
@@ -2128,7 +2143,8 @@ msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt"
 
 #: methods/http.cc:594
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt"
+msgstr ""
+"Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt"
 
 #: methods/http.cc:609
 msgid "The HTTP server sent an invalid Content-Range header"
@@ -2173,19 +2189,19 @@ msgstr ""
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Datei konnte nicht eingekürzt werden"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -2222,14 +2238,17 @@ msgstr ""
 "Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::"
 "Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"Die MMap-Größe hat bereits das festgelegte Limit von %lu Byte erreicht. Der "
-"Versuch, die MMap zu vergrößern, wird abgebrochen."
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
@@ -2255,7 +2274,7 @@ msgstr "%li min %li s"
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Auswahl %s nicht gefunden"
@@ -2389,154 +2408,171 @@ msgstr "Es konnte nicht nach %s gewechselt werden"
 msgid "Failed to stat the cdrom"
 msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Sperrdatei %s konnte nicht geöffnet werden"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Konnte Sperre %s nicht bekommen"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Unterprozess %s hat das Signal %u empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Unterprozess %s unerwartet beendet"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Datei %s konnte nicht geöffnet werden"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 "Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben nicht "
 "möglich"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Beim Schließen der Datei trat ein Problem auf"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Beim Schließen der Datei trat ein Problem auf"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Beim Synchronisieren der Datei trat ein Problem auf"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Beim Entfernen (unlink) der Datei trat ein Problem auf"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Beim Synchronisieren der Datei trat ein Problem auf"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Leerer Paket-Cache"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Die Paket-Cache-Datei ist beschädigt"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Der Paket-Cache wurde für eine andere Architektur aufgebaut"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Hängt ab von"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Hängt ab von (vorher)"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Schlägt vor"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Empfiehlt"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Kollidiert mit"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Ersetzt"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Veraltet"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Stört"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Wertet auf"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "wichtig"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "erforderlich"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2566,7 +2602,7 @@ msgstr "StateFile %s konnte nicht geöffnet werden"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Temporäres StateFile %s konnte nicht geschrieben werden"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2651,14 +2687,14 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt.conf« "
-"unter APT::Immediate-Configure bezüglich weiterer Details. (%d)"
+"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt."
+"conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)"
 
 #: apt-pkg/packagemanager.cc:452
 #, c-format
@@ -2708,7 +2744,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Probleme können nicht korrigiert werden, Sie haben gehaltene defekte Pakete."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2757,15 +2793,15 @@ msgstr "Methode %s ist nicht korrekt gestartet"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und drücken "
-"Sie die Eingabetaste (Enter)."
+"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
+"drücken Sie die Eingabetaste (Enter)."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketierungssystem »%s« wird nicht unterstützt"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
 
@@ -2780,152 +2816,174 @@ msgstr ""
 "Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
 "eintragen"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet "
 "werden."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Pinning-Typ %s kann nicht interpretiert werden"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Keine Priorität (oder Null) für Pin angegeben"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache hat ein inkompatibles Versionssystem"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese "
 "APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
 "APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen "
 "diese APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
 "diese APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Ein Fehler trat auf beim Verarbeiten von %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "E/A-Fehler beim Speichern des Quell-Caches"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2934,7 +2992,7 @@ msgstr ""
 "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
 "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2943,32 +3001,42 @@ msgstr ""
 "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
 "Sie dieses Paket von Hand korrigieren müssen."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Größe stimmt nicht überein"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Release-Datei %s kann nicht verarbeitet werden"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Keine Bereiche (Sections) in Release-Datei %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Kein Hash-Eintrag in Release-Datei %s"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Kein Hash-Eintrag in Release-Datei %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Kein Hash-Eintrag in Release-Datei %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -3021,8 +3089,8 @@ msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "%zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu "
 "Signaturen gefunden\n"
@@ -3065,129 +3133,166 @@ msgstr "Schreiben der neuen Quellliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Quelllisteneinträge für dieses Medium sind:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Es wurden %i Datensätze geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien "
 "geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Nicht vorhandene Datei %s wird übersprungen"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash-Summe stimmt nicht überein für: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "%s wird installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wird konfiguriert"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s wird entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wird vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Aufruf des Nach-Installations-Triggers %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Verzeichnis »%s« fehlt"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Datei %s konnte nicht geöffnet werden"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wird entpackt"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Konfiguration von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Entfernen von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Vollständiges Entfernen von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Schreiben des Protokolls nicht möglich, openpty() fehlgeschlagen (/dev/pts "
 "nicht eingebunden?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "Ausführen von dpkg"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3196,21 +3301,23 @@ msgstr ""
 "Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von "
 "einem anderen Prozess verwendet?"
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 "Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"Der dpkg-Prozess wurde unterbrochen; Sie müssen »dpkg --configure -a« manuell "
-"ausführen, um das Problem zu beheben."
+"Der dpkg-Prozess wurde unterbrochen; Sie müssen »dpkg --configure -a« "
+"manuell ausführen, um das Problem zu beheben."
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Nicht gesperrt"
 
@@ -3232,9 +3339,41 @@ msgstr ""
 "Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch nichts "
 "mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt zu sein."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Verbindung vorzeitig beendet"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Task %s konnte nicht gefunden werden"
+
+#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+#~ msgstr ""
+#~ "F: Zu viele Schlüsselringe sollten an gpgv übergeben werden. Abbruch."
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "F: Argumentenliste von Acquire::gpgv::Options zu lang. Abbruch."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Lesefehler von Prozess %s"
+
+#~ msgid ""
+#~ "The size of a MMap has already reached the defined limit of %lu bytes,"
+#~ "abort the try to grow the MMap."
+#~ msgstr ""
+#~ "Die MMap-Größe hat bereits das festgelegte Limit von %lu Byte erreicht. "
+#~ "Der Versuch, die MMap zu vergrößern, wird abgebrochen."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
diff --git a/po/dz.po b/po/dz.po
index 012a92209..8a49d49d6 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
+"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,150 +19,149 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "བརླག་སྟོར་ཞུགས་པ:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "རྟེན་འབྲེལ་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་  ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(མ་ཐོབ།)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "མི་ངོ:"
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -183,6 +183,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -317,12 +318,12 @@ msgstr ""
 "  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
 "བཟུམ།\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr " %sལུ་འབྲི་མ་ཚུགས།"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
 
@@ -661,79 +662,79 @@ msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི
 msgid "Failed to rename %s to %s"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "ཝའི།"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr "ཡང་ན།"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s( %s་གིས་སྦེ)"
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -741,144 +742,241 @@ msgstr ""
 "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
 "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ"
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"ཐུམ་སྒྲིལ་%s་འདི་འཐོབ་མི་ཚུགས་པས་ འདི་འབདཝ་ད་ཐུམ་སྒྲིལ་གཞན་ཅིག་གིས་གྲོས་བསྟུན་འབད་དེ་ཡོད།\n"
+"འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་  ཡང་ན་\n"
+"འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
+"འབད་བས།\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
+"འབད་བས།\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་[y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "ནང་འཁོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་"
 "ཡོད!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་"
 "བས།"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -889,28 +987,28 @@ msgstr ""
 "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "བར་བཤོལ་འབད།"
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -918,130 +1016,57 @@ msgstr ""
 "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
 "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
-"འབད་བས།\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
-"འབད་བས།\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "མི་ངོ་འཐོན་རིམཚུ།"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ"
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"ཐུམ་སྒྲིལ་%s་འདི་འཐོབ་མི་ཚུགས་པས་ འདི་འབདཝ་ད་ཐུམ་སྒྲིལ་གཞན་ཅིག་གིས་གྲོས་བསྟུན་འབད་དེ་ཡོད།\n"
-"འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་  ཡང་ན་\n"
-"འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1051,7 +1076,7 @@ msgid_plural ""
 msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1059,11 +1084,11 @@ msgid_plural ""
 msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1079,44 +1104,24 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1124,7 +1129,7 @@ msgstr ""
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
 "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1135,126 +1140,151 @@ msgstr ""
 "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1263,32 +1293,32 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1313,6 +1343,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1375,7 +1407,7 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
 "                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1627,9 +1659,9 @@ msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་ས
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
@@ -1658,10 +1690,9 @@ msgstr "%sinfo་ངོ་བཤུས་འབད་ནི་ལུ་འཐུ
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
 
@@ -1794,12 +1825,12 @@ msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།"
 msgid "File not found"
 msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
@@ -1861,7 +1892,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས"
 msgid "Server closed the connection"
 msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "འཛོལ་བ་ལྷབ།"
 
@@ -1873,202 +1904,182 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས
 msgid "Protocol corruption"
 msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "འཛོལ་བ་འབྲི།"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་  མཐུད་ལམ་ངལ་མཚམས།"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གིས་སླབ་མས:%s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་'%s'་གིས་སླབ་མས།"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "འདྲི་དཔྱད།"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s)་ལུ་མཐུད་དོ།"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་  མཐུད་ལམ་ངལ་མཚམས།"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s་ལུ་མཐུད་དོ།"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག  ཕྱིར་"
-"འཐོན་དོ།"
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་  འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
 "མ་ཚུགས?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
@@ -2130,20 +2141,20 @@ msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
@@ -2178,11 +2189,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2209,7 +2225,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
@@ -2340,153 +2356,170 @@ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚ
 msgid "Failed to stat the cdrom"
 msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "མི་མཐུནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "ཚབ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "གལ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "དགོས་མཁོ་ཡོདཔ།"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "ཚད་ལྡན།"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "གདམ་ཁ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "ཐེབས།"
 
@@ -2517,7 +2550,7 @@ msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བ
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2602,7 +2635,7 @@ msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐི
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2653,7 +2686,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2703,12 +2736,12 @@ msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦ
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
 
@@ -2722,141 +2755,163 @@ msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་  ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "%s (ཐུམ་སྒྲིལ་གསརཔ་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༢་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr " %s (འཐོན་རིམ་གསརཔ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "%s (ལག་ལེན་ཐུམ་སྒྲིལ་ ༣་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོབ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "%s (འཐོན་རིམ་གསརཔ་ ༢)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2865,7 +2920,7 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2874,32 +2929,42 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2953,8 +3018,8 @@ msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོ
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་  %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n"
 
 #: apt-pkg/cdrom.cc:677
@@ -2993,145 +3058,184 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས
 msgid "Source list entries for this disc are:\n"
 msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་"
 "ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3149,10 +3253,34 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག  ཕྱིར་"
+#~ "འཐོན་དོ།"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "%s (འཐོན་རིམ་གསརཔ་ ༢)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།"
 
@@ -3203,8 +3331,8 @@ msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལ
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་  %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n"
 
 #, fuzzy
diff --git a/po/el.po b/po/el.po
index c8fe647f7..2e9d0611c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,10 +15,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,148 +27,147 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Το πακέτο %s με έκδοση %s έχει ανικανοποίητες εξαρτήσεις:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Αδυναμία εντοπισμού του πακέτου %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Συνολικά Ονόματα Πακέτων : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Συνολικά Ονόματα Πακέτων : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Κανονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr " Πλήρως Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr " Μονά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr " Μικτά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "Αγνοούμενα: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Σύνολο Εξαρτήσεων: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Σύνολο Αντιστοιχίσεων Παροχών: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Σύνολο Κοινών Στοιχειοσειρών : "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Σύνολο χώρου ασφαλείας: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Συνολικός Καταμετρημένος Χώρος: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Δε βρέθηκαν πακέτα"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Αδυναμία εντοπισμού του πακέτου %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Αρχεία Πακέτου:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Καθηλωμένα Πακέτα:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(δε βρέθηκαν)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Εγκατεστημένα: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Υποψήφιο: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr " Καθήλωση Πακέτου: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -189,6 +189,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -325,12 +326,12 @@ msgstr ""
 "  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
 "  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Αδύνατη η εγγραφή στο %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
 
@@ -669,79 +670,79 @@ msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
 msgid "Failed to rename %s to %s"
 msgstr "Αποτυχία μετονομασίας του %s σε %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "αλλά το %s είναι εγκατεστημένο"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "αλλά δεν είναι εγκαταστάσημο"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "αλλά είναι ένα εικονικό πακέτο"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "αλλά δεν είναι εγκατεστημένο"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " η"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (λόγω του %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -749,146 +750,244 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
 "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu επανεγκατεστημένα,"
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu υποβαθμισμένα, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Εγκατεστημένα]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Υποψήφιες Εκδόσεις"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Το πακέτο %s δεν είναι διαθέσιμο, αλλά υπάρχει αναφορά για αυτό από άλλο "
+"πακέτο.\n"
+"Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
+"από άλλη πηγή\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
+"του\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Διόρθωση εξαρτήσεων..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " απέτυχε."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Ετοιμο"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
 "προβλήματα."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
 "debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Μετά από αυτή τη λειτουργία, θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ναι, κανε ότι λέω!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -899,28 +998,28 @@ msgstr ""
 "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Εγκατάλειψη."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -928,133 +1027,59 @@ msgstr ""
 "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
 "ή το --fix-missing;"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Εγκατεστημένα]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Υποψήφιες Εκδόσεις"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Το πακέτο %s δεν είναι διαθέσιμο, αλλά υπάρχει αναφορά για αυτό από άλλο "
-"πακέτο.\n"
-"Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
-"από άλλη πηγή\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
-"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
-"του\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1066,7 +1091,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1076,11 +1101,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1098,43 +1123,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Αδύνατη η εύρεση του πακέτου %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1142,7 +1147,7 @@ msgstr ""
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1154,124 +1159,149 @@ msgstr ""
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Αδύνατη η εύρεση του πακέτου %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Υπολογισμός της αναβάθμισης... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Ετοιμο"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1279,7 +1309,7 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1288,32 +1318,32 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1338,6 +1368,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1396,7 +1428,7 @@ msgstr ""
 "για περισσότερες πληροφορίες και επιλογές.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1647,9 +1679,9 @@ msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέ
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Αδύνατη η ανάγνωση του %s"
@@ -1678,10 +1710,9 @@ msgstr "Αποτυχία εύρεσης της κατάστασης του %sinf
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Ανάγνωση Λιστών Πακέτων"
 
@@ -1815,12 +1846,12 @@ msgstr "Ο δίσκος δεν βρέθηκε."
 msgid "File not found"
 msgstr "Το αρχείο Δε Βρέθηκε"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Αποτυχία εύρεσης της κατάστασης"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
 
@@ -1882,7 +1913,7 @@ msgstr "Λήξη χρόνου σύνδεσης"
 msgid "Server closed the connection"
 msgstr "Ο διακομιστής έκλεισε την σύνδεση"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Σφάλμα ανάγνωσης"
 
@@ -1894,185 +1925,177 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν
 msgid "Protocol corruption"
 msgstr "Αλλοίωση του πρωτοκόλλου"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Σφάλμα εγγραφής"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Αδύνατη η αποστολή της εντολής PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Λήξη χρόνου υποδοχής δεδομένων"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Επερώτηση"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Αδύνατη η εκτέλεση"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Σύνδεση στο %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Σύνδεση στο %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Αδύνατη η εύρεση του '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
 "αποτυπώματος?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
 "εγκατεστημένο το gpgv;)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2080,16 +2103,6 @@ msgstr ""
 "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν "
 "διαθέσιμο το δημόσιο κλειδί:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
@@ -2152,20 +2165,20 @@ msgstr ""
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Αποτυχία εγγραφής του αρχείου %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
@@ -2200,11 +2213,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2231,7 +2249,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Η επιλογή %s δε βρέθηκε"
@@ -2365,155 +2383,172 @@ msgstr "Αδύνατη η αλλαγή σε %s"
 msgid "Failed to stat the cdrom"
 msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος "
 "%s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Αδύνατο το κλείδωμα %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Άδειο cache πακέτων"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Εξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "ΠροΕξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Προτείνει"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Συστήνει"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Ασύμβατο με"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Αντικαθιστά"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Απαρχαιώνει"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Χαλάει"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "σημαντικό"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "απαιτούμενο"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "καθιερωμένο"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "προαιρετικό"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "επιπλέον"
 
@@ -2543,7 +2578,7 @@ msgstr "Αποτυχία ανοίγματος του αρχείου κατάστ
 msgid "Failed to write temporary StateFile %s"
 msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2628,7 +2663,7 @@ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγ
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2679,7 +2714,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2731,12 +2766,12 @@ msgstr ""
 "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
 "enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
 
@@ -2749,146 +2784,168 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Συλλογή Παροχών Αρχείου"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2897,7 +2954,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2906,7 +2963,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2914,25 +2971,35 @@ msgstr ""
 "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
 "πακέτο %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2985,8 +3052,8 @@ msgstr "Σάρωση του δίσκου για περιεχόμενα...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Βρέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι "
 "μεταφράσεων και %zu υπογραφές\n"
@@ -3027,145 +3094,184 @@ msgstr "Eγγραφή νέας λίστας πηγών\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Εγιναν %i εγγραφές.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Ρύθμιση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Αφαιρώ το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Εκτέλεση του post-installation trigger %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Ο φάκελος %s αγνοείται."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Προετοιμασία του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Ξεπακετάρισμα του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Προετοιμασία ρύθμισης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Έγινε εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Προετοιμασία για την αφαίρεση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Αφαίρεσα το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
 "προσαρτημένο το /dev/pts;)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3183,10 +3289,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Η σύνδεση έκλεισε πρόωρα"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 4e2344b42..e8b2b0e8d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,155 +7,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Package %s version %s has an unmet dep:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Unable to locate package %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Total package names: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total package names: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normal packages: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Pure virtual packages: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Single virtual packages: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Mixed virtual packages: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Missing: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Total distinct versions: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Total distinct descriptions: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Total dependencies: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Total ver/file relations: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Total Desc/File relations: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Total Provides mappings: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Total globbed strings: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Total dependency version space: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Total slack space: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Total space accounted for: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Package file %s is out of sync."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "You must give exactly one pattern"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "No packages found"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Unable to locate package %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Package files:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache is out of sync, can't x-ref a package file"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pinned packages:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(not found)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installed: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidate: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(none)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Package pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Version table:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s compiled on %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -176,6 +177,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -308,12 +310,12 @@ msgstr ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Unable to write to %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Cannot get debconf version. Is debconf installed?"
 
@@ -648,79 +650,79 @@ msgstr "Problem unlinking %s"
 msgid "Failed to rename %s to %s"
 msgstr "Failed to rename %s to %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex compilation error - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "The following packages have unmet dependencies."
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "but %s is installed"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "but %s is to be installed"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "but it is not installable"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "but it is a virtual package"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "but it is not installed"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "but it is not going to be installed"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " or"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "The following NEW packages will be installed"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "The following packages will be REMOVED"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "The following packages have been kept back:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "The following packages will be upgraded:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "The following packages will be DOWNGRADED:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "The following held packages will be changed:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (due to %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -728,140 +730,233 @@ msgstr ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu upgraded, %lu newly installed, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalled, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu downgraded, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu to remove and %lu not upgraded.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu not fully installed or removed.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Note, selecting %s for regex ‘%s’\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Note, selecting %s for regex ‘%s’\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Selected version %s (%s) for %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Package %s is a virtual package provided by:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installed]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Candidate versions"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "You should explicitly select one to install."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "However the following packages replace it:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Package %s has no installation candidate"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Note, selecting %s instead of %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s is already the newest version.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s set to manually installed.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Package %s is not installed, so not removed\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Correcting dependencies..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " failed."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Unable to correct dependencies"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Unable to minimise the upgrade set"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr "Done"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "You might want to run ‘apt-get -f install’ to correct these."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Unmet dependencies. Try using -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNING: The following packages cannot be authenticated!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Authentication warning overridden.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Install these packages without verification [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Some packages could not be authenticated"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "There are problems and -y was used without --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internal error, InstallPackages was called with broken packages!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Packages need to be removed but remove is disabled."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internal error, Ordering didn't finish"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Need to get %sB/%sB of archives.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Need to get %sB of archives.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "After this operation, %sB of additional disk space will be used.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "After this operation, %sB disk space will be freed.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Couldn't determine free space in %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "You don't have enough free space in %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only specified but this is not a trivial operation."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -872,28 +967,28 @@ msgstr ""
 "To continue type in the phrase ‘%s’\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abort."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Do you want to continue [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Failed to fetch %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Some files failed to download"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Download complete and in download only mode"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -901,126 +996,57 @@ msgstr ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing and media swapping is not currently supported"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Unable to correct missing packages."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Aborting install."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Note, selecting %s instead of %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Package %s is not installed, so not removed\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Package %s is a virtual package provided by:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Installed]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Candidate versions"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "You should explicitly select one to install."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "However the following packages replace it:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Package %s has no installation candidate"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s is already the newest version.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release ‘%s’ for ‘%s’ was not found"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version ‘%s’ for ‘%s’ was not found"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Selected version %s (%s) for %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Couldn't stat source package list %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "The update command takes no arguments"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1034,7 +1060,7 @@ msgstr[1] ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1046,11 +1072,11 @@ msgstr[1] ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' to remove them."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1068,43 +1094,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "The following information may help to resolve the situation:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internal Error, AutoRemoved broke stuff"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, AllUpgrade broke stuff"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Couldn't find task %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Couldn't find package %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Note, selecting %s for regex ‘%s’\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s set to manually installed.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "You might want to run 'apt-get -f install' to correct these:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1112,7 +1118,7 @@ msgstr ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1124,120 +1130,145 @@ msgstr ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Broken packages"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "The following extra packages will be installed:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Suggested packages:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Recommended packages:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Couldn't find package %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s set to manually installed.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Calculating upgrade... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Failed"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Done"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internal error, problem resolver broke stuff"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Unable to lock the download directory"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Must specify at least one package for which to fetch source"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Unable to find a source package for %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Skipping already downloaded file '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "You don't have enough free space in %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Need to get %sB/%sB of source archives.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Need to get %sB of source archives.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fetch source %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Failed to fetch some archives."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Skipping unpack of already unpacked source in %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Unpack command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Check if the 'dpkg-dev' package is installed.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Child process failed"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Must specify at least one package for which you want to check builddeps"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Unable to get build-dependency information for %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s has no build depends.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1246,7 +1277,7 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1255,31 +1286,31 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Failed to satisfy %s dependency for %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Build-dependencies for %s could not be satisfied."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Failed to process build dependencies"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Supported modules:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1304,6 +1335,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1364,7 +1397,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1611,9 +1644,9 @@ msgstr "File %s/%s overwrites the one in the package %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Unable to read %s"
@@ -1642,10 +1675,9 @@ msgstr "Failed to stat %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "The info and temp directories need to be on the same filesystem"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Reading package lists"
 
@@ -1778,12 +1810,12 @@ msgstr "Disk not found."
 msgid "File not found"
 msgstr "File not found"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Failed to stat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Failed to set modification time"
 
@@ -1845,7 +1877,7 @@ msgstr "Connection timeout"
 msgid "Server closed the connection"
 msgstr "Server closed the connection"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Read error"
 
@@ -1857,182 +1889,174 @@ msgstr "A response overflowed the buffer."
 msgid "Protocol corruption"
 msgstr "Protocol corruption"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Write error"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Could not create a socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Could not connect data socket, connection timed out"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Could not connect, passive socket."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo was unable to get a listening socket"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Could not bind a socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Could not listen on the socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Could not determine the name of the socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Unable to send PORT command"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Unknown address family %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT failed, server said: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Data socket connect timed out"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Unable to accept connection"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problem hashing file"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Unable to fetch file, server said ‘%s’"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Data socket timed out"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Data transfer failed, server said ‘%s’"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Query"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Unable to invoke"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Connecting to %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Could not create a socket for %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Cannot initiate the connection to %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Could not connect to %s:%s (%s), connection timed out"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Could not connect to %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connecting to %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Could not resolve ‘%s’"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporary failure resolving ‘%s’"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Unable to connect to %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Aborting install."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "At least one invalid signature was encountered."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Unknown error executing gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "The following signatures were invalid:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2040,16 +2064,6 @@ msgstr ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Couldn't open pipe for %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Read error from %s process"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Waiting for headers"
@@ -2111,19 +2125,19 @@ msgstr "Error reading from server. Remote end closed connection"
 msgid "Error reading from server"
 msgstr "Error reading from server"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Bad header data"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Internal error"
 
@@ -2158,11 +2172,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2189,7 +2208,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selection %s not found"
@@ -2320,152 +2339,169 @@ msgstr "Unable to change to %s"
 msgid "Failed to stat the cdrom"
 msgstr "Failed to stat the cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Not using locking for read only lock file %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Could not open lock file %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Not using locking for nfs mounted lock file %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Could not get lock %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Waited for %s but it wasn't there"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-process %s received a segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Sub-process %s received a segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-process %s returned an error code (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Sub-process %s exited unexpectedly"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Could not open file %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Couldn't open pipe for %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "read, still have %lu to read but none left"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "write, still have %lu to write but couldn't"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem closing the file"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Problem closing the file"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem syncing the file"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problem unlinking the file"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problem syncing the file"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Empty package cache"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "The package cache file is corrupted"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "The package cache file is an incompatible version"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "This APT does not support the versioning system ‘%s’"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "The package cache was built for a different architecture"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depends"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Suggests"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recommends"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Replaces"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Obsoletes"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Breaks"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "required"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2495,7 +2531,7 @@ msgstr "Failed to open StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Failed to write temporary StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2580,7 +2616,7 @@ msgstr "Malformed line %u in source list %s (type)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Type ‘%s’ is not known on line %u in source list %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2629,7 +2665,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Unable to correct problems, you have held broken packages."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2680,12 +2716,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Packaging system ‘%s’ is not supported"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Unable to determine a suitable packaging system type"
 
@@ -2698,139 +2734,161 @@ msgstr "Unable to stat %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "You must put some 'source' URIs in your sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "The package lists or status file could not be parsed or opened."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "You may want to run apt-get update to correct these problems"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Invalid record in the preferences file, no Package header"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Did not understand pin type %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "No priority (or zero) specified for pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache has an incompatible versioning system"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Error occurred while processing %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Error occurred while processing %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Error occurred while processing %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Error occurred while processing %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Error occurred while processing %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Error occurred while processing %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Error occurred while processing %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Error occurred while processing %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Error occurred while processing %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Wow, you exceeded the number of package names this APT can handle.."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, you exceeded the number of versions this APT can handle."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Wow, you exceeded the number of descriptions this APT can handle."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wow, you exceeded the number of dependencies this APT can handle."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Error occurred while processing %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Error occurred while processing %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Package %s %s was not found while processing file dependencies"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Couldn't stat source package list %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Collecting File Provides"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO Error saving source cache"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename failed, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum mismatch"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum mismatch"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "There is no public key available for the following key IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2839,7 +2897,7 @@ msgstr ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2848,32 +2906,42 @@ msgstr ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "The package index files are corrupted. No Filename: field for package %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Size mismatch"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Unable to parse package file %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Note, selecting %s instead of %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Invalid line in the diversion file: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Unable to parse package file %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2926,11 +2994,11 @@ msgstr "Scanning disc for index files..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
-"Found %zu package indices, %zu source indices, %zu translation indices and %"
-"zu signatures\n"
+"Found %zu package indices, %zu source indices, %zu translation indices and "
+"%zu signatures\n"
 
 #: apt-pkg/cdrom.cc:677
 msgid ""
@@ -2968,143 +3036,182 @@ msgstr "Writing new source list\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Source list entries for this disc are:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Wrote %i records.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Wrote %i records with %i missing files.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Wrote %i records with %i mismatched files\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Opening configuration file %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum mismatch"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Installing %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuring %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Removing %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Completely removed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Running post-installation trigger %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory '%s' missing."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Could not open file %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparing %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Unpacking %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparing to configure %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Installed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparing for removal of %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Removed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparing to completely remove %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Completely removed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Unable to lock the list directory"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3122,10 +3229,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Release ‘%s’ for ‘%s’ was not found"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Version ‘%s’ for ‘%s’ was not found"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Couldn't find task %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Couldn't open pipe for %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Read error from %s process"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Error occurred while processing %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Malformed line %u in source list %s (vendor id)"
 
diff --git a/po/es.po b/po/es.po
index d73c51368..c58b3d84a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,157 +9,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-15 21:52+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "El paquete %s versión %s tiene dependencias incumplidas:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "No se ha podido localizar el paquete %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Nombres de paquetes totales: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Nombres de paquetes totales: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales únicos: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales mixtos: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Faltan: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Versiones diferentes totales: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Descipciones diferentes totales: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Dependencias totales: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Relaciones versión/archivo totales: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Relaciones descripción/archivo totales: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Mapeo Total de Provisiones: "
 
 # globbed -> globalizadas ? (jfs)
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Cadenas globalizadas totales: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Espacio de versión de dependencias total: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Espacio desperdiciado total: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Espacio registrado total: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El archivo de paquetes %s está desincronizado."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
-msgstr "Debe dar exactamente un patrón"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
+msgstr "Debes dar cuando menos un nombre de archivo"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "No se encontró ningún paquete"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "No se ha podido localizar el paquete %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Archivos de paquetes:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Paquetes con pin:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(no encontrado)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalados: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pin del paquete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabla de versión:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -180,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -318,12 +320,12 @@ msgstr ""
 "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
 "cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "No se puede escribir en %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?"
 
@@ -663,79 +665,79 @@ msgstr "Hay problemas desligando %s"
 msgid "Failed to rename %s to %s"
 msgstr "Falló el renombre de %s a %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación de expresiones regulares - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s está instalado"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero %s va a ser instalado"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "pero no es instalable"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "pero es un paquete virtual"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "pero no está instalado"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "pero no va a instalarse"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes NUEVOS:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Los siguientes paquetes se ELIMINARÁN:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Los siguientes paquetes se han retenido:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Se actualizarán los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Se cambiarán los siguientes paquetes retenidos:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -743,143 +745,236 @@ msgstr ""
 "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
 "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizados, %lu se instalarán, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para eliminar y %lu no actualizados.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instalados del todo o eliminados.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versión seleccionada %s (%s) para %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "El paquete %s es un paquete virtual provisto por:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instalado]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versiones candidatas"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Necesita seleccionar explícitamente uno para instalar."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"El paquete %s no está disponible, pero algún otro paquete hace referencia\n"
+"a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n"
+"encuentra disponible desde alguna otra fuente\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "El paquete %s no tiene candidato para su instalación"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Nota, seleccionando %s en lugar de %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ya está en su versión más reciente.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "fijado %s como instalado manualmente.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "El paquete %s no esta instalado, no se eliminará\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Corrigiendo dependencias..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " falló."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "No se puede corregir las dependencias"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "No se puede minimizar el conjunto de actualización"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Listo"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Tal vez quiera ejecutar 'apt-get -f install' para corregirlo."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticación ignorado.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "¿Instalar estos paquetes sin verificación [s/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Algunos paquetes no se pueden autenticar"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hay problemas y se utilizó -y sin --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, InstallPackages fue llamado con un paquete roto!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no terminó el ordenamiento"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Que raro.. Los tamaños no concuerdan, mande un correo a \n"
 "apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Se necesita descargar %sB/%sB de archivos.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Necesito descargar %sB de archivos.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Se utilizarán %sB de espacio de disco adicional después de esta operación.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Se liberarán %sB después de esta operación.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No tiene suficiente espacio libre en %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡haga lo que le digo!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -890,28 +985,28 @@ msgstr ""
 "Para continuar escriba la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abortado."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Desea continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Algunos archivos no pudieron descargarse"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sólo descarga"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -919,127 +1014,58 @@ msgstr ""
 "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n"
 "apt-get update o deba intentarlo de nuevo con --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "No se pudieron corregir los paquetes que faltan."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Abortando la instalación."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, seleccionando %s en lugar de %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "El paquete %s no esta instalado, no se eliminará\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "El paquete %s es un paquete virtual provisto por:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instalado]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versiones candidatas"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Necesita seleccionar explícitamente uno para instalar."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"El paquete %s no está disponible, pero algún otro paquete hace referencia\n"
-"a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n"
-"encuentra disponible desde alguna otra fuente\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "El paquete %s no tiene candidato para su instalación"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ya está en su versión más reciente.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "No se encontró la Distribución '%s' para '%s'"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "No se encontró la versión '%s' para '%s'"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Versión seleccionada %s (%s) para %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "No se puede leer la lista de paquetes fuente %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "El comando de actualización no toma argumentos"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1053,7 +1079,7 @@ msgstr[1] ""
 "Se instalaron de forma automática los siguientes paquetes y ya no son "
 "necesarios."
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1065,11 +1091,11 @@ msgstr[1] ""
 "Se instalaron de forma automática los siguientes paquetes y ya no son "
 "necesarios."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilice «apt-get autoremove» para eliminarlos."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1087,43 +1113,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información puede ayudar a resolver la situación:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error Interno, AllUpgrade rompió cosas"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "No se pudo encontrar la tarea %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "No se pudo encontrar el paquete %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "fijado %s como instalado manualmente.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Tal vez quiera ejecutar 'apt-get -f install' para corregirlo:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1131,7 +1137,7 @@ msgstr ""
 "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
 "especifique una solución)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1143,123 +1149,148 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes extras:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "No se pudo encontrar el paquete %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "fijado %s como instalado manualmente.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Calculando la actualización... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Falló"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Listo"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de solución de problemas rompió\n"
 "algunas cosas"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Debe especificar al menos un paquete para obtener su código fuente"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No se pudo encontrar un paquete de fuentes para %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ignorando fichero ya descargado '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No tiene suficiente espacio libre en %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orden de desempaquetamiento '%s'.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción '%s'.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Debe especificar al menos un paquete para verificar sus\n"
 "dependencias de construcción"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "No se pudo obtener información de dependencias de construcción para %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1268,7 +1299,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede \n"
 "encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1277,32 +1308,32 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n"
 "disponible del paquete %s satisface los requisitos de versión"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
 "demasiado nuevo"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1327,6 +1358,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1388,7 +1421,7 @@ msgstr ""
 "para más información y opciones.\n"
 "                       Este APT tiene poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1641,9 +1674,9 @@ msgstr "El archivo %s/%s sobreescribe al que est
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "No pude leer %s"
@@ -1673,10 +1706,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Los directorios info y temp deben de estar en el mismo sistema de archivos"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Leyendo lista de paquetes"
 
@@ -1809,12 +1841,12 @@ msgstr "Disco no encontrado."
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "No pude leer"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "No pude poner el tiempo de modificación"
 
@@ -1876,7 +1908,7 @@ msgstr "La conexi
 msgid "Server closed the connection"
 msgstr "El servidor cerró la conexión"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Error de lectura"
 
@@ -1888,184 +1920,175 @@ msgstr "Una respuesta desbord
 msgid "Protocol corruption"
 msgstr "Corrupción del protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "No pude crear un socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "No pude conectar un socket pasivo."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo no pude obtener un socket oyente"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "No pude ligar un socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "No pude escuchar en el socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "No pude determinar el nombre del socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "No pude mandar la orden PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Dirección de familia %u desconocida (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Expiró conexión a socket de datos"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexión"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Imposible traer archivo, el servidor dijo '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Expiró el socket de datos"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Falló transferencia de datos, el servidor dijo '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "No pude invocar "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "No puedo iniciar la conexión a %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "No pude conectarme a %s:%s (%s), expiró tiempo para conexión"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No pude conectarme a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No pude resolver '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal al resolver '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo raro pasó resolviendo '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "No pude conectarme a %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Abortando la instalación."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Se encontró al menos una firma inválida."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "No se pudo ejecutar '%s'  para verificar la firma (¿está instalado gpgv?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Error desconocido ejecutando gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firms fueron inválidas:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2073,16 +2096,6 @@ msgstr ""
 "Las firmas siguientes no se pudieron verificar porque su llave pública no "
 "está disponible:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "No pude abrir una tubería para %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Error de lectura de %s procesos"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
@@ -2144,19 +2157,19 @@ msgstr "Error leyendo del servidor, el lado remoto cerr
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Falló al truncar el archivo"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Fallo la conexión"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -2191,11 +2204,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2222,7 +2240,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selección %s no encontrada"
@@ -2359,152 +2377,169 @@ msgstr "No se pudo cambiar a %s"
 msgid "Failed to stat the cdrom"
 msgstr "No pude montar el cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No se pudo abrir el fichero de bloqueo '%s'"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No se pudo bloquear %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero no estaba allí"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El subproceso %s recibió un fallo de segmentación."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subproceso %s recibió un fallo de segmentación."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El subproceso %s devolvió un código de error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subproceso %s terminó de forma inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "No pude abrir el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "No pude abrir una tubería para %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "leídos, todavía debía leer %lu pero no queda nada"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problemas cerrando el archivo"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problemas cerrando el archivo"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Hay problemas sincronizando el fichero"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Hay problemas desligando el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Hay problemas sincronizando el fichero"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Caché de paquetes vacía."
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "El archivo de caché de paquetes esta corrompido"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "El archivo de caché de paquetes es una versión incompatible"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT no soporta el sistema de versiones '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "La caché de paquetes se había creado para una arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Sugiere"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Entra en conflicto"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Reemplaza"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Hace obsoleto"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "requiere"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2534,7 +2569,7 @@ msgstr "No se pudo abrir el fichero de estado %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falló la escritura del fichero de estado temporal %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, fuzzy, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr "Error interno, no pude leer un récord del paquete"
@@ -2619,7 +2654,7 @@ msgstr "L
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo '%s' desconocido en la línea %u de lista de fuentes %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2672,7 +2707,7 @@ msgstr ""
 "No se pudieron corregir los problemas, usted ha retenido paquetes\n"
 "rotos."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2722,12 +2757,12 @@ msgstr "El m
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y presione Intro"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema de paquetes '%s' no está soportado"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
 
@@ -2740,150 +2775,172 @@ msgstr "No se pudo leer %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe poner algunos URIs 'fuente' en su sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "No se pudieron analizar o abrir las listas de paquetes o el archivo de "
 "estado."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Registro inválido en el archivo de preferencias, no hay cabecera de paquete"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "No se entiende el pin tipo %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "No hay prioridad especificada para pin (o es cero)"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "La caché tiene una versión incompatible de sistema de versiones"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Ocurrió un error mientras se procesaba %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Ocurrió un error mientras se procesaba %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Ocurrió un error mientras se procesaba %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Ocurrió un error mientras se procesaba %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Ocurrió un error mientras se procesaba %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Ocurrió un error mientras se procesaba %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Ocurrió un error mientras se procesaba %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Ocurrió un error mientras se procesaba %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de nombres de paquetes que este APT es capaz de "
 "manejar."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de descripciones que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de dependencias que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Ocurrió un error mientras procesaba %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Ocurrió un error mientras procesaba %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Al procesar las dependencias de archivos no se encontró el\n"
 "paquete %s %s"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "No se puede leer la lista de paquetes fuente %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Recogiendo archivos que proveen"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Error de E/S guardando caché fuente"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló el cambio de nombre, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 difiere"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "La suma hash difiere"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "No existe ninguna clave pública disponible para los siguientes "
 "identificadores de clave:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2893,7 +2950,7 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2902,7 +2959,7 @@ msgstr ""
 "No se pudo localizar un archivo para el paquete %s. Esto puede significar "
 "que necesita arreglar manualmente este paquete."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2910,25 +2967,35 @@ msgstr ""
 "Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' "
 "no existe para para el paquete %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "El tamaño difiere"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Nota, seleccionando %s en lugar de %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linea inválida en el archivo de desviación: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "No se pudo tratar el archivo de paquetes %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2981,8 +3048,8 @@ msgstr "Buscando en el disco archivos de 
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices "
 "de traducción y %zu firmas\n"
@@ -3026,146 +3093,185 @@ msgstr "Escribiendo nueva lista de fuente\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Las entradas de la lista de fuentes para este disco son:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i registros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i registros escritos con %i fichero de menos.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i registros escritos con %i fichero mal emparejado\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Abriendo fichero de configuración %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "La suma hash difiere"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Se borró completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Ejecutando disparador post-instalación %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta el directorio '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "No pude abrir el fichero %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s eliminado"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para eliminar completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Se borró completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No se pudo escbribir en el registro, falló la llamada a «openpty()» (¿está "
 "montado /dev/pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "No se pudo bloquear el directorio de listas"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3183,10 +3289,36 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "La conexión se cerró prematuramente"
 
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "Debe dar exactamente un patrón"
+
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "No se encontró la Distribución '%s' para '%s'"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "No se encontró la versión '%s' para '%s'"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "No se pudo encontrar la tarea %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. "
+#~ "Terminando."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "No pude abrir una tubería para %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Error de lectura de %s procesos"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Ocurrió un error mientras se procesaba %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)"
 
@@ -3234,8 +3366,8 @@ msgstr "La conexi
 #~ msgstr "Etiqueta guardada: %s \n"
 
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Se encontraron %i índices de paquetes, %i índices de fuentes, %i índices "
 #~ "de traducción y %i firmas\n"
@@ -3434,9 +3566,6 @@ msgstr "La conexi
 #~ msgid "Unimplemented"
 #~ msgstr "No está implementado"
 
-#~ msgid "You must give at least one file name"
-#~ msgstr "Debes dar cuando menos un nombre de archivo"
-
 #~ msgid "Generating cache"
 #~ msgstr "Generando el caché"
 
diff --git a/po/eu.po b/po/eu.po
index 21b39ec35..82dfb6a9d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,159 +7,160 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ezin da %s paketea lokalizatu"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Pakete normalak:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Pakete birtual puruak:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Bakanako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Nahastutako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Falta direnak: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Bertsio Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Azalpen Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Dependentziak Guztira: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Guztira Bertsio/fitxategi erlazioak: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Fitx/Azalpen erlazioak guztira: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Guztira Saltzaile Mapatzea: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Guztira bateratutako kateak: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Guztira bertsio dependentzia lekua: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Guztira galdutako tokia:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Guztira erregistratutako lekua: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s pakete fitxategia ez dago sinkronizatuta."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Zehazki eredu bat eman behar duzu."
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Ez da paketerik aurkitu"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ezin da %s paketea lokalizatu"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Pakete Fitxategiak:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
 "pakete fitxategi bati"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pin duten Paketeak:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(ez da aurkitu)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalatuta: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Hautagaia: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -180,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -312,12 +314,12 @@ msgstr ""
 "  -c=? Irakurri konfigurazio fitxategi hau\n"
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s : ezin da idatzi"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
 
@@ -651,79 +653,79 @@ msgstr "Arazoa %s desestekatzean"
 msgid "Failed to rename %s to %s"
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "baina %s instalatuta dago"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "baina %s instalatzeko dago"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "baina ez da instalagarria"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "baina pakete birtuala da"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "baina ez dago instalatuta"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "baina ez da instalatuko"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " edo"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Ondorengo paketeak KENDUKO dira:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Ondorengo paketeak mantendu egin dira:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Ondorengo paketeak bertsio-berrituko dira:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (arrazoia: %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -731,142 +733,235 @@ msgstr ""
 "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
 "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu berrinstalatuta, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu aurreko bertsiora itzulita, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ez erabat instalatuta edo kenduta.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "%s pakete birtual bat da, honek hornitua:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instalatuta]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Hautagaien bertsioak"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Zehazki bat hautatu behar duzu instalatzeko."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"%s paketea ez dago erabilgarri, baina beste pakete batek erreferentzia \n"
+"egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n"
+"beste iturburu batean bakarrik egongo da erabilgarri\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Baina ondorengo paketeek ordezten dute:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "%s paketeak ez du instalatzeko hautagairik"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s bertsiorik berriena da jada.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s eskuz instalatua bezala ezarri.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Mendekotasunak zuzentzen..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " : huts egin du."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Ezin dira mendekotasunak zuzendu"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Eginda"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Egiaztapen abisua gainidazten.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Zenbait pakete ezin dira egiaztatu"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Ezin izan da Iturburu zerrenda irakurri."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
 "berri emanez (ingelesez)"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Bai, egin esandakoa!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -877,28 +972,28 @@ msgstr ""
 "Jarraitzeko, idatzi '%s' esaldia\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abortatu."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -906,126 +1001,57 @@ msgstr ""
 "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
 "--fix-missing aukerarekin saiatu?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Falta diren paketeak ezin dira zuzendu."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Abortatu instalazioa."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s pakete birtual bat da, honek hornitua:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instalatuta]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Hautagaien bertsioak"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Zehazki bat hautatu behar duzu instalatzeko."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"%s paketea ez dago erabilgarri, baina beste pakete batek erreferentzia \n"
-"egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n"
-"beste iturburu batean bakarrik egongo da erabilgarri\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Baina ondorengo paketeek ordezten dute:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "%s paketeak ez du instalatzeko hautagairik"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s bertsiorik berriena da jada.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1039,7 +1065,7 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1051,11 +1077,11 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "'apt-get autoremove' erabili ezabatzeko."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1073,43 +1099,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Ezin izan da %s zeregina aurkitu"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Ezin izan da %s paketea aurkitu"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s eskuz instalatua bezala ezarri.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1117,7 +1123,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1129,121 +1135,146 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Ezin izan da %s paketea aurkitu"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s eskuz instalatua bezala ezarri.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Berriketak kalkulatzen... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Eginda"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1251,7 +1282,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1260,32 +1291,32 @@ msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
 "betetzen dituen %3$s paketearen bertsio erabilgarririk"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
 "paketea berriegia da"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1310,6 +1341,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1370,7 +1403,7 @@ msgstr ""
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1618,9 +1651,9 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
@@ -1649,10 +1682,9 @@ msgstr "Huts egin du %sinfo-tik datuak lortzean"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Pakete Zerrenda irakurtzen"
 
@@ -1787,12 +1819,12 @@ msgstr "Ez da diska aurkitu"
 msgid "File not found"
 msgstr "Ez da fitxategia aurkitu"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Huts egin du atzitzean"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Huts egin du aldaketa ordua ezartzean"
 
@@ -1856,7 +1888,7 @@ msgstr "Konexioa denboraz kanpo"
 msgid "Server closed the connection"
 msgstr "Zerbitzariak konexioa itxi du"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Irakurketa errorea"
 
@@ -1868,183 +1900,175 @@ msgstr "Erantzun batek bufferrari gainez eragin dio."
 msgid "Protocol corruption"
 msgstr "Protokolo hondatzea"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Idazketa errorea"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Ezin izan da socket-a sortu"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Ezin izan da socket pasibora konektatu."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Ezin izan da socket bat lotu"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Ezin izan da socket-ean entzun"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Ezin izan da socket-aren izena zehaztu"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Ezin da PORT komandoa bidali"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Helbide familia ezezagunaa: %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Datu-socket konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Datu-socketak denbora muga gainditu du"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Kontsulta"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Ezin da deitu "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ezin izan da konektatu -> %s:%s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Konektatzen -> %s..."
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ezin izan da '%s' ebatzi"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Aldi baterako akatsa '%s' ebaztean"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ezin da konektatu -> %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Abortatu instalazioa."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2052,16 +2076,6 @@ msgstr ""
 "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
 "eskuragarri:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Irakurri errorea %s prozesutik"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
@@ -2123,19 +2137,19 @@ msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Huts fitxategia mozterakoan"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Barne errorea"
 
@@ -2172,11 +2186,16 @@ msgstr ""
 "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
 "balioa: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2203,7 +2222,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s hautapena ez da aurkitu"
@@ -2335,155 +2354,172 @@ msgstr "Ezin da %s(e)ra aldatu"
 msgid "Failed to stat the cdrom"
 msgstr "Huts egin du CDROMa atzitzean"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo "
 "fitxategiarentzat"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ezin izan da %s blokeo fitxategia ireki"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ezin izan da %s blokeoa hartu"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s azpiprozesua ustekabean amaitu da"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Arazoa fitxategia ixtean"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Arazoa fitxategia sinkronizatzean"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Arazoa fitxategia desestekatzean"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Paketeen katxea hutsik"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Paketeen katxe fitxategia hondatuta dago"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT honek ez du '%s' bertsio sistema onartzen"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Mendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Aurremendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Iradokizuna:"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Gomendioa:"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Gatazka:"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Ordeztea:"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Zaharkitzea:"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Apurturik"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "garrantzitsua"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "beharrezkoa"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "estandarra"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "aukerakoa"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "estra"
 
@@ -2513,7 +2549,7 @@ msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2598,7 +2634,7 @@ msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2648,7 +2684,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2698,12 +2734,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' pakete sistema ez da onartzen"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
 
@@ -2716,139 +2752,161 @@ msgstr "Ezin da %s atzitu."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Ez da ulertu %s orratz-mota (pin)"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Katxearen bertsio sistema ez da bateragarria"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Errorea gertatu da %s prozesatzean (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Fitxategiaren erreferentziak biltzen"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "S/I errorea iturburu katxea gordetzean"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ez dator bat"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2857,7 +2915,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2866,7 +2924,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2874,25 +2932,35 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2945,8 +3013,8 @@ msgstr "Indize fitxategien bila diska arakatzen...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura "
 "aurkitu dira\n"
@@ -2987,146 +3055,185 @@ msgstr "Jatorri zerrenda berria idazten\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Diskoarentzako jatorri sarrerak:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i erregistro grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "%s konfigurazio fitxategia irekitzen"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "%s Instalatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfiguratzen"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s kentzen"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfiguratzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s Instalatuta"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s kentzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s kendurik"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
 "muntaturik?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3144,10 +3251,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Konexioa behar baino lehenago itxi da"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Ezin izan da %s zeregina aurkitu"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Irakurri errorea %s prozesutik"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)"
 
diff --git a/po/fi.po b/po/fi.po
index b3c8c7bb0..373df2c89 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,156 +8,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Pakettia %s ei löydy"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Tavallisia paketteja: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Aitoja näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Yksinkertaisia näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Sekanäennäispaketteja: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Puuttuu: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Eri versioita yhteensä: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Eri kuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Riippuvuuksia yhteensä: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Versio/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Kuvaus/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Tarjoamiskuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Erilaisia merkkijonoja yhteensä: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Versioriippuvuustila yhteensä: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Löysää tilaa yhteensä: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Käytetty tila yhteensä: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakettitiedosto %s ei ole ajan tasalla."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "On annettava täsmälleen yksi lauseke"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Yhtään pakettia ei löytynyt"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Pakettia %s ei löydy"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Pakettitiedostot:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Paketit joissa tunniste:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(ei löydy)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Asennettu: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Ehdokas: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Paketin tunnistenumero: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -178,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -309,12 +311,12 @@ msgstr ""
 "  -c=? Lue tämä asetustiedosto\n"
 "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
 
@@ -652,79 +654,79 @@ msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
 msgid "Failed to rename %s to %s"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "K"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "mutta %s on asennettu"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mutta %s on merkitty asennettavaksi"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "mutta ei ole asennuskelpoinen"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "mutta on näennäispaketti"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "mutta ei ole asennettu"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "mutta ei ole merkitty asennettavaksi"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " tai"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Seuraavat UUDET paketit asennetaan:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Seuraavat paketit POISTETAAN:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Nämä paketit on jätetty odottamaan:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Nämä paketit päivitetään:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nämä paketit VARHENNETAAN:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Seuraavat pysytetyt paketit muutetaan:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (syynä %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -732,142 +734,235 @@ msgstr ""
 "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
 "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu päivitetty, %lu uutta asennusta, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu uudelleen asennettua, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu varhennettua, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Asennettu]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Mahdolliset versiot"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Yksi pitää valita asennettavaksi."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Pakettia %s ei ole saatavilla, mutta toinen paketti viittaa siihen.\n"
+"Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
+"saatavilla vain jostain muusta lähteestä\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Paketilla %s ei ole asennettavaa valintaa"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Huomautus, valitaan %s eikä %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s on jo uusin versio.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Korjataan riippuvuuksia..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " ei onnistunut."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Riippuvuuksien korjaus ei onnistu"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Päivitysjoukon minimointi ei onnistu"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Valmis"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Varoitus varmistamisesta on ohitettu.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st/%st.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Kyllä, tee kuten käsketään!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -878,28 +973,28 @@ msgstr ""
 "Jatka kirjoittamalla \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Keskeytä."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Haluatko jatkaa [K/e]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -907,127 +1002,58 @@ msgstr ""
 "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
 "kokeile --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Puuttuvia paketteja ei voi korjata."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Asennus keskeytetään."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Huomautus, valitaan %s eikä %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Asennettu]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Mahdolliset versiot"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Yksi pitää valita asennettavaksi."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Pakettia %s ei ole saatavilla, mutta toinen paketti viittaa siihen.\n"
-"Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
-"saatavilla vain jostain muusta lähteestä\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Paketilla %s ei ole asennettavaa valintaa"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s on jo uusin versio.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Valittiin versio %s (%s) paketille %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1041,7 +1067,7 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1053,11 +1079,11 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Poista ne komennolla \"apt-get autoremove\"."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1075,43 +1101,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Tehtävää %s ei löytynyt"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Pakettia %s ei löytynyt"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1119,7 +1125,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1130,120 +1136,145 @@ msgstr ""
 "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielä luotu tai siirretty Incoming-kansiosta."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Pakettia %s ei löytynyt"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Käsitellään päivitystä ... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Valmis"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1251,7 +1282,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1260,32 +1291,32 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
 "uusi"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1310,6 +1341,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1369,7 +1402,7 @@ msgstr ""
 "lisätietoja ja lisää valitsimia.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1618,9 +1651,9 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
@@ -1649,10 +1682,9 @@ msgstr "stat ei toimi: %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Luetaan pakettiluetteloita"
 
@@ -1787,12 +1819,12 @@ msgstr "Levyä ei löydy"
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Komento stat ei toiminut"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
 
@@ -1854,7 +1886,7 @@ msgstr "Yhteys aikakatkaistiin"
 msgid "Server closed the connection"
 msgstr "Palvelin sulki yhteyden"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lukuvirhe"
 
@@ -1866,184 +1898,175 @@ msgstr "Vastaus aiheutti puskurin ylivuodon."
 msgid "Protocol corruption"
 msgstr "Yhteyskäytäntö on turmeltunut"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Virhe kirjoitettaessa"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Pistoketta ei voitu luoda"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Passiivista pistoketta ei voitu kytkeä."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ei saanut kuuntelupistoketta"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Pistoketta ei voitu nimetä"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Pistoketta ei voitu kuunnella"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Pistokkeen nimeä ei saatu selville"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Komennon PORT lähetys ei onnistu"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Tuntematon osoiteperhe %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\""
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Pistoke aikakatkaistiin"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Kysely"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Käynnistys ei onnistu"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Avataan yhteys %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nimeä \"%s\" ei voitu selvittää"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Asennus keskeytetään."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2051,16 +2074,6 @@ msgstr ""
 "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole "
 "saatavilla:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Putkea %s ei voitu avata"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Prosessi %s ilmoitti lukuvirheestä"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
@@ -2122,19 +2135,19 @@ msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Tiedoston typistäminen ei onnistunut"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
@@ -2169,11 +2182,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2200,7 +2218,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valintaa %s ei löydy"
@@ -2331,152 +2349,169 @@ msgstr "Kansioon %s vaihto ei onnistu"
 msgid "Failed to stat the cdrom"
 msgstr "Komento stat ei toiminut rompulle"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Lukkotiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Lukkoa %s ei saada"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitä ei ollut"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Aliprosessi %s palautti virhekoodin (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Aliprosessi %s lopetti odottamatta"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Putkea %s ei voitu avata"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Pulmia tiedoston sulkemisessa"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Pulmia tehtäessä tiedostolle sync"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Pulmia tehtäessä tiedostolle unlink"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Pulmia tehtäessä tiedostolle sync"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Pakettivarasto on tyhjä"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Pakettivarasto on turmeltunut"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Pakettivaraston versio on yhteensopimaton"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Täydet korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Rikkoo"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "tärkeä"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "välttämätön"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "perus"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "valinnainen"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "ylimääräinen"
 
@@ -2506,7 +2541,7 @@ msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2591,7 +2626,7 @@ msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2605,9 +2640,9 @@ msgid ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"Tämän asennusajo vaatii tilapäisesti poistettavaksi välttämättömän paketin %"
-"s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta "
-"jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
+"Tämän asennusajo vaatii tilapäisesti poistettavaksi välttämättömän paketin "
+"%s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, "
+"mutta jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
 
 #: apt-pkg/packagemanager.cc:495
 #, c-format
@@ -2639,7 +2674,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2689,12 +2724,12 @@ msgstr "Menetelmä %s ei käynnistynyt oikein"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
 
@@ -2707,141 +2742,163 @@ msgstr "stat %s ei onnistu."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Tunnistetyyppi %s on tuntematon"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia."
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Kootaan tiedostojen tarjoamistietoja"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ei täsmää"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum täsmää"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2850,7 +2907,7 @@ msgstr ""
 "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
 "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2859,7 +2916,7 @@ msgstr ""
 "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
 "tämän paketin itse."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2867,25 +2924,35 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Huomautus, valitaan %s eikä %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Virheellinen rivi korvautustiedostossa: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2938,8 +3005,8 @@ msgstr "Etsitään levyltä hakemistotiedostoja...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, "
 "käännösten %zu ja allekirjoituksia löytyi %zu\n"
@@ -2980,147 +3047,186 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Kirjoitettiin %i tietuetta.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta "
 "tiedostoa\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Avataan asetustiedosto %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum täsmää"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Asennetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Tehdään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Poistetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Suoritetaan jälkiasennusliipaisin %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Puretaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Valmistaudutaan tekemään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s asennettu"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Valmistaudutaan poistamaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s poistettu"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
 "liittämättä?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Luettelokansiota ei voitu lukita"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3138,10 +3244,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Yhteys katkesi ennenaikaisesti"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Tehtävää %s ei löytynyt"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Putkea %s ei voitu avata"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Prosessi %s ilmoitti lukuvirheestä"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr ""
 #~ "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)"
diff --git a/po/fr.po b/po/fr.po
index 600769782..695da9cdb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,157 +8,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2010-02-27 07:25+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: fr <debian-l10n-french@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Le paquet %s de version %s contient une dépendance absente :\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossible de trouver le paquet %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Nombre total de paquets : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Nombre total de paquets : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Paquets ordinaires : "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Paquets entièrement virtuels : "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuels simples : "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuels mixtes : "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Manquants : "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Nombre de versions distinctes : "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Nombre de descriptions distinctes : "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Nombre de dépendances : "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Nombre de relations version/fichier : "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Nombre de relations description/fichier : "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Nombre de relations « Provides » : "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Nombre de motifs rationnels : "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Espace occupé par les versions des dépendances : "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Espace disque gaspillé : "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Total de l'espace attribué : "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fichier %s désynchronisé."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Vous devez fournir exactement un motif"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Aucun paquet n'a été trouvé"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossible de trouver le paquet %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Fichiers du paquet :"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Le cache est désynchronisé, impossible de référencer un fichier"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Paquets étiquetés :"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(non trouvé)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installé : "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidat : "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(aucun)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Étiquette de paquet : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr " Table de version :"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pour %s compilé sur %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -179,6 +180,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -317,12 +319,12 @@ msgstr ""
 "   -c=? Lit ce fichier de configuration\n"
 "   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossible d'écrire sur %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
@@ -393,7 +395,8 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 "Usage : apt-ftparchive [options] commande\n"
-"Commandes :  paquets binarypath [fichier d'« override » [chemin du préfixe]]\n"
+"Commandes :  paquets binarypath [fichier d'« override » [chemin du "
+"préfixe]]\n"
 "             sources srcpath [fichier d'« override » [chemin du préfixe]]\n"
 "             contents path\n"
 "             release path\n"
@@ -660,79 +663,79 @@ msgstr "Problème en déliant %s"
 msgid "Failed to rename %s to %s"
 msgstr "Impossible de changer le nom %s en %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erreur de compilation de l'expression rationnelle - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "mais %s est installé"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mais %s devra être installé"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "mais il n'est pas installable"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "mais c'est un paquet virtuel"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "mais il n'est pas installé"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "mais ne sera pas installé"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Les NOUVEAUX paquets suivants seront installés :"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Les paquets suivants seront ENLEVÉS :"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Les paquets suivants ont été conservés :"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Les paquets suivants seront mis à jour :"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Les paquets retenus suivants seront changés :"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (en raison de %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -741,136 +744,231 @@ msgstr ""
 "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
 "que vous êtes en train de faire."
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu mis à jour, %lu nouvellement installés, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu réinstallés, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu remis à une version inférieure, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu à enlever et %lu non mis à jour.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu partiellement installés ou enlevés.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Version choisie %s (%s) pour %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installé]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versions possibles"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Vous devez explicitement sélectionner un paquet à installer."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Aucune version du paquet %s n'est disponible, mais il existe dans la base\n"
+"de données. Cela signifie en général que le paquet est manquant, qu'il est "
+"devenu obsolète\n"
+"ou qu'il n'est disponible que sur une autre source\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Cependant les paquets suivants le remplacent :"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Aucun paquet ne correspond au paquet %s"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Note, sélection de %s au lieu de %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s est déjà la plus récente version disponible.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s passé en « installé manuellement ».\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Correction des dépendances..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " a échoué."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Impossible de corriger les dépendances"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossible de minimiser le nombre des paquets mis à jour"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Fait"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Avertissement d'authentification ignoré.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Certains paquets n'ont pas pu être authentifiés"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut être lue."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
 "courriel à apt@packages.debian.org."
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so dans les archives.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
@@ -878,11 +976,11 @@ msgstr ""
 
 # The space before the exclamation mark must not be a non-breaking space; this
 # sentence is supposed to be typed by a user who cannot see the difference.
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Oui, faites ce que je vous dis !"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -893,28 +991,28 @@ msgstr ""
 "Pour continuer, tapez la phrase « %s »\n"
 " ?]"
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Annulation."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n] ? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -922,132 +1020,61 @@ msgstr ""
 "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
 "get update ou essayer avec --fix-missing ?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Impossible de corriger le fait que les paquets manquent."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Annulation de l'installation."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Note, sélection de %s au lieu de %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Installé]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versions possibles"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Vous devez explicitement sélectionner un paquet à installer."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Aucune version du paquet %s n'est disponible, mais il existe dans la base\n"
-"de données. Cela signifie en général que le paquet est manquant, qu'il est "
-"devenu obsolète\n"
-"ou qu'il n'est disponible que sur une autre source\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Cependant les paquets suivants le remplacent :"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Aucun paquet ne correspond au paquet %s"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
-"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s est déjà la plus récente version disponible.\n"
 
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "La version  « %s » de « %s » est introuvable"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "La version « %s » de « %s » n'a pu être trouvée"
-
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Version choisie %s (%s) pour %s\n"
-
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 "La distribution cible « %s » indisponible pour le paquet « %s » est ignorée"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "La version « %s » indisponible du paquet « %s » est ignorée"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas d'argument"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Aucune suppression n'est sensée se produire : impossible de lancer "
 "« Autoremover »"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1061,7 +1088,7 @@ msgstr[1] ""
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1071,11 +1098,11 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1094,44 +1121,25 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider à résoudre la situation : "
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Impossible de trouver la tâche %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Impossible de trouver le paquet %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s passé en « installé manuellement ».\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
+msgstr ""
+"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1139,7 +1147,7 @@ msgstr ""
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1151,123 +1159,148 @@ msgstr ""
 "la distribution unstable, que certains paquets n'ont pas encore\n"
 "été créés ou ne sont pas sortis d'Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Impossible de trouver le paquet %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s passé en « installé manuellement ».\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise à jour... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Échec"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Fait"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Erreur interne, la tentative de résolution du problème a cassé certaines "
 "parties"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Vous devez spécifier au moins un paquet source"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Nécessité de prendre %so/%so dans les sources.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Nécessité de prendre %so dans les sources.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Il faut spécifier au moins un paquet pour vérifier les dépendances de "
 "construction"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossible d'obtenir les dépendances de construction pour %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1276,7 +1309,7 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
 "peut être trouvé"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1285,33 +1318,34 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
 "du paquet %s ne peut satisfaire à la version requise"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
 "est trop récent"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1335,6 +1369,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1396,7 +1432,7 @@ msgstr ""
 "apt.conf(5) pour plus d'informations et d'option.\n"
 "                      Cet APT a les « Super Cow Powers »\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1652,9 +1688,9 @@ msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
@@ -1685,10 +1721,9 @@ msgstr ""
 "Les répertoires info et temp doivent se trouver sur le même système de "
 "fichiers"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Lecture des listes de paquets"
 
@@ -1773,8 +1808,8 @@ msgstr "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
-"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » ou "
-"« %s »"
+"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » "
+"ou « %s »"
 
 #: apt-inst/deb/debfile.cc:110
 #, c-format
@@ -1825,12 +1860,12 @@ msgstr "Disque non trouvé."
 msgid "File not found"
 msgstr "Fichier non trouvé"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Impossible de statuer"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Impossible de modifier l'heure "
 
@@ -1893,7 +1928,7 @@ msgstr "Dépassement du délai de connexion"
 msgid "Server closed the connection"
 msgstr "Le serveur a fermé la connexion"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erreur de lecture"
 
@@ -1905,189 +1940,180 @@ msgstr "Une réponse a fait déborder le tampon."
 msgid "Protocol corruption"
 msgstr "Corruption du protocole"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Impossible de créer un connecteur"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Impossible de se connecter sur le port de données, délai de connexion dépassé"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Impossible de se connecter au port en mode passif."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Impossible de se connecter à un port"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Impossible d'écouter sur le port"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Impossible de déterminer le nom du port"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Impossible d'envoyer la commande PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famille d'adresses %u inconnue (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT a échoué, le serveur a répondu : %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Délai de connexion au port de données dépassé"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Pas de réponse du port données dans les délais"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Requête"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Impossible d'invoquer "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Connexion à %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP : %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Connexion à %s: %s (%s) impossible."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion à %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ne parvient pas à résoudre « %s »"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Erreur temporaire de résolution de « %s »"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
-"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%"
-"s » (%i - %s)"
+"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:"
+"%s » (%i - %s)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossible de se connecter à %s:%s :"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Pas de porte-clés installé dans %s."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr "E: trop de porte-clés devraient être passés à gpgv. Abandon."
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erreur interne : signature correcte, mais il est impossible de déterminer "
 "l'empreinte de la clé."
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a été rencontrée."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossible d'exécuter « %s » pour contrôler la signature\n"
 "(veuillez vérifier si gpgv est installé)."
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue à l'exécution de gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valables :\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2095,16 +2121,6 @@ msgstr ""
 "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
 "n'est pas disponible :\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Ne parvient pas à ouvrir le tube pour %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Erreur de lecture du processus %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-tête"
@@ -2166,19 +2182,19 @@ msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Échec de la troncature du fichier"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -2216,14 +2232,17 @@ msgstr ""
 "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
 "actuelle est de %lu (voir « man 5 apt.conf »)."
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"La taille d'une « MMap » (carte en mémoire) a déjà atteint la limite définie "
-"de %lu octets. Abandon de la tentative d'agrandir la « MMap »."
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
@@ -2249,7 +2268,7 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "La sélection %s n'a pu être trouvée"
@@ -2384,152 +2403,169 @@ msgstr "Impossible d'accéder à %s"
 msgid "Failed to stat the cdrom"
 msgstr "Impossible d'accéder au cédérom."
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossible d'ouvrir le fichier verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossible d'obtenir le verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "A attendu %s mais il n'était pas présent"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Le sous-processus %s a reçu le signal %u"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Le sous-processus %s s'est arrêté prématurément"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ne parvient pas à ouvrir le tube pour %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problème de fermeture du fichier"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problème de fermeture du fichier"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problème de synchronisation du fichier"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problème d'effacement du fichier"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problème de synchronisation du fichier"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Cache des paquets vide"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Le fichier de cache des paquets est corrompu"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Le fichier de cache des paquets a une version incompatible"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Cet APT ne supporte pas le système de version « %s »"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Le cache des paquets a été construit pour une architecture différente"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Dépend"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Pré-Dépend"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Suggère"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recommande"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Est en conflit avec"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Remplace"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Rend obsolète"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Casse"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Améliore"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "nécessaire"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "optionnel"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "supplémentaire"
 
@@ -2559,7 +2595,7 @@ msgstr "Impossible d'ouvrir le fichier d'état %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Erreur d'écriture du fichier d'état temporaire %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2648,9 +2684,10 @@ msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
 #: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2709,7 +2746,7 @@ msgstr ""
 "Impossible de corriger les problèmes, des paquets défectueux sont en mode "
 "« garder en l'état »."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2761,12 +2798,12 @@ msgstr ""
 "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
 "touche Entrée."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Le système de paquet « %s » n'est pas supporté"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossible de déterminer un type du système de paquets adéquat"
 
@@ -2780,155 +2817,177 @@ msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Vous devez insérer quelques adresses « sources » dans votre sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
 "lus."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
 "« Package »."
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Étiquette %s inconnue"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Le cache possède un système de version incompatible"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Erreur apparue lors du traitement de %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Erreur apparue lors du traitement de %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Erreur apparue lors du traitement de %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de versions que cette version d'APT est capable "
 "de traiter."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de descriptions que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de dépendances que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
 "fichiers"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossible de localiser la liste des paquets sources %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Assemblage des fichiers listés dans les champs Provides"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr ""
 "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "impossible de changer le nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Somme de contrôle MD5 incohérente"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Somme de contrôle de hachage incohérente"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2937,7 +2996,7 @@ msgstr ""
 "Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
 "devrez corriger ce paquet vous-même (absence d'architecture)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2946,7 +3005,7 @@ msgstr ""
 "Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
 "devrez corriger ce paquet vous-même."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2954,25 +3013,35 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Taille incohérente"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossible d'analyser le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Pas de sections dans le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Pas d'entrée de hachage dans le fichier Release %s"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Pas d'entrée de hachage dans le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pas d'entrée de hachage dans le fichier Release %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -3025,8 +3094,8 @@ msgstr "Examen du disque à la recherche de fichiers d'index...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions "
 "et %zu signatures\n"
@@ -3069,129 +3138,166 @@ msgstr "Écriture de la nouvelle liste de sources\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrées de listes de sources pour ce disque sont :\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i enregistrements écrits.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
 "correspondent pas\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Fichier %s inexistant ignoré"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Somme de contrôle de hachage incohérente pour %s"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Installation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, c-format
 msgid "Completely removing %s"
 msgstr "Suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Exécution des actions différées (« trigger ») de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Répertoire %s inexistant"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Préparation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Décompression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Préparation de la configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s installé"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Préparation de la suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Préparation de la suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossible d'écrire le journal, échec d'openpty()\n"
 "(/dev/pts est-il monté ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "Exécution de dpkg"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3200,22 +3306,24 @@ msgstr ""
 "Impossible de verrouiller le répertoire d'administration (%s). Il est "
 "possible qu'un autre processus l'utilise."
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 "Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
 "privilèges du superutilisateur ?"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg a été interrompu. Il est nécessaire d'utiliser « dpkg --configure -a » "
 "pour corriger le problème."
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Non verrouillé"
 
@@ -3237,10 +3345,42 @@ msgstr ""
 "Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
 "correctif semble être corrompu."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Connexion fermée prématurément"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "La version  « %s » de « %s » est introuvable"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "La version « %s » de « %s » n'a pu être trouvée"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Impossible de trouver la tâche %s"
+
+#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+#~ msgstr "E: trop de porte-clés devraient être passés à gpgv. Abandon."
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Ne parvient pas à ouvrir le tube pour %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Erreur de lecture du processus %s"
+
+#~ msgid ""
+#~ "The size of a MMap has already reached the defined limit of %lu bytes,"
+#~ "abort the try to grow the MMap."
+#~ msgstr ""
+#~ "La taille d'une « MMap » (carte en mémoire) a déjà atteint la limite "
+#~ "définie de %lu octets. Abandon de la tentative d'agrandir la « MMap »."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr ""
 #~ "Ligne %u mal formée dans la liste des sources %s (identifiant du "
diff --git a/po/gl.po b/po/gl.po
index 2da6d4d87..ba067130b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,159 +8,160 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-12-17 22:44+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Non se puido atopar o paquete %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Número total de nomes de paquetes : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Número total de nomes de paquetes : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Paquetes normais: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuais puros: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuais simples: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuais mixtos: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Non atopados: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Número total de versións distintas: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Número total de descricións distintas: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Número total de dependencias: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Número total de relacións versión/ficheiro: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Número total de relacións descrición/ficheiro: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Número total de mapas de Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Número total de cadeas: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Espazo total de versións de dependencias: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Espazo de reserva total: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Espazo total contabilizado: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro de paquete %s está sen sincronizar."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Debe fornecer exactamente un patrón"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Non se atopou ningún paquete"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Non se puido atopar o paquete %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Ficheiros de paquetes:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de "
 "paquetes"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Paquetes inmobilizados:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(non se atopou)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ningún)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Inmobilizado: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado o %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -181,6 +182,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -317,12 +319,12 @@ msgstr ""
 "  -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Non se puido escribir en %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Non se puido obter a versión de debconf. ¿Debconf está instalado?"
 
@@ -663,79 +665,79 @@ msgstr "Problema ao borrar %s"
 msgid "Failed to rename %s to %s"
 msgstr "Non se puido cambiar o nome de %s a %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro na compilación da expresión regular - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s está instalado"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero hase instalar %s"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "pero non é instalable"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "pero é un paquete virtual"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "pero non está instalado"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "pero non se ha instalar"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Os seguintes paquetes NOVOS hanse instalar:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Os seguintes paquetes hanse ELIMINAR:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Os seguintes paquetes consérvanse:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Os seguintes paquetes hanse actualizar:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os seguintes paquetes hanse DESACTUALIZAR:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes paquetes retidos hanse modificar:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (debido a %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -743,141 +745,234 @@ msgstr ""
 "AVISO: Hanse eliminar os seguintes paquetes esenciais.\n"
 "¡Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizados, %lu instalados, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu hanse eliminar e %lu sen actualizar.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non instalados ou eliminados de todo.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Escolleuse a versión %s (%s) de %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "O paquete %s é un paquete virtual fornecido por:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instalado]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versións candidatas"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Debería escoller un para instalar."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"O paquete %s non está dispoñible, pero outro paquete fai referencia a el.\n"
+"Isto pode significar que o paquete falla, está obsoleto ou só está\n"
+"dispoñible noutra fonte.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Nembargantes, os seguintes paquetes substitúeno:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "O paquete %s non ten un candidato para a instalación"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Nota, escóllese %s no canto de %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "A reinstalación de %s non é posible, non se pode descargar.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s xa é a versión máis recente.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s cambiouse a instalado manualmente.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "O paquete %s non está instalado, así que non se eliminou\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "A corrixir as dependencias..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " fallou."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Non se puido corrixir as dependencias."
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Non se puido minimizar o xogo de actualizacións"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Rematado"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Pode querer executar \"apt-get -f install\" para corrixilos."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencias incumpridas. Probe a empregar -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Ignórase o aviso de autenticación.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "¿Instalar estes paquetes sen verificación [s/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Non se puido autenticar algúns paquetes"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Houbo problemas e empregouse -y sen --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos."
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Non se puido ler a lista de orixes."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Hai que recibir %sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Despois desta operación hanse liberar %sB de disco.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non se puido determinar o espazo libre en %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Non hai espazo libre de abondo en %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "¡Si, fai o que digo!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -888,28 +983,28 @@ msgstr ""
 "Para continuar escriba a frase \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abortar."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quere continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non se puido obter %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Non se puido descargar algúns ficheiros"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -917,130 +1012,61 @@ msgstr ""
 "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-"
 "missing."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "O emprego conxunto de --fix-missing e intercambio de discos non está "
 "soportado"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Non se puido corrixir os paquetes non dispoñibles."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "A abortar a instalación."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, escóllese %s no canto de %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "O paquete %s non está instalado, así que non se eliminou\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "O paquete %s é un paquete virtual fornecido por:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instalado]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versións candidatas"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Debería escoller un para instalar."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"O paquete %s non está dispoñible, pero outro paquete fai referencia a el.\n"
-"Isto pode significar que o paquete falla, está obsoleto ou só está\n"
-"dispoñible noutra fonte.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Nembargantes, os seguintes paquetes substitúeno:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "O paquete %s non ten un candidato para a instalación"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "A reinstalación de %s non é posible, non se pode descargar.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s xa é a versión máis recente.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Non se atopou a versión \"%s\" de \"%s\""
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Non se atopou a versión \"%s\" de \"%s\""
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Escolleuse a versión %s (%s) de %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Non se atopou a lista de paquetes fonte %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "A orde \"update\" non toma argumentos"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non se supón que se deban eliminar cousas; non se pode iniciar o "
 "autoeliminador"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1052,7 +1078,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1062,11 +1088,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empregue \"apt-get autoremove\" para eliminalos."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1084,43 +1110,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a resolver a situación:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro interno, o autoeliminador rompeu cousas"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade rompeu cousas"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Non se puido atopar a tarefa %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Non se puido atopar o paquete %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s cambiouse a instalado manualmente.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1128,7 +1134,7 @@ msgstr ""
 "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
 "especifique unha solución)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1139,122 +1145,147 @@ msgstr ""
 "unha situación imposible ou, se emprega a distribución inestable, que\n"
 "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Hanse instalar os seguintes paquetes extra:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Paquetes suxiridos:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Non se puido atopar o paquete %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s cambiouse a instalado manualmente.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualización... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Fallou"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Rematado"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o resolvedor interno rompeu cousas"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Non se puido bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle descargar o código fonte"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non se puido atopar un paquete fonte para %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre de abondo en %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai que recibir %sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Non se puido recibir algúns arquivos."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a codificación de %s.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle comprobar as dependencias "
 "de compilación"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non se puido obter a información de dependencias de compilación de %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1263,7 +1294,7 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
 "o paquete %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1272,32 +1303,32 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
 "dispoñible do paquete %s satisfai os requirimentos de versión"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
 "novo de máis"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Non se puido procesar as dependencias de compilación"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1322,6 +1353,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1385,7 +1418,7 @@ msgstr ""
 "máis información e opcións.\n"
 "                  Este APT ten Poderes de Supervaca.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1633,9 +1666,9 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Non se pode ler %s"
@@ -1665,10 +1698,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "A ler as listas de paquetes"
 
@@ -1801,12 +1833,12 @@ msgstr "Non se atopou o disco"
 msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Non se atopou"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Non se puido estabrecer a hora de modificación"
 
@@ -1868,7 +1900,7 @@ msgstr "Tempo esgotado para a conexión"
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexión"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erro de lectura"
 
@@ -1880,187 +1912,178 @@ msgstr "Unha resposta desbordou o buffer."
 msgid "Protocol corruption"
 msgstr "Corrupción do protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erro de escritura"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Non se puido crear un socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Non se puido conectar o socket de datos, o tempo esgotouse para a conexión"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Non se puido conectar o socket pasivo."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo non puido obter un socket para escoitar"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Non se puido ligar un socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Non se puido escoitar no socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Non se puido determinar o nome do socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Non se puido enviar a orde PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familia de enderezos %u (AF_*) descoñecida"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "A orde EPRT fallou, o servidor dixo: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "A conexión do socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Non se pode aceptar a conexión"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Non se pode obter o ficheiro, o servidor dixo \"%s\""
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "O socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "A transferencia de datos fallou, o servidor dixo \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Petición"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Non se puido chamar a "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "A conectar a %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Non se pode iniciar a conexión a %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Non se puido conectar a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "A conectar a %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Non se puido resolver \"%s\""
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal ao resolver \"%s\""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Non se pode conectar a %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "A abortar a instalación."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
 "dixital da chave"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse alomenos unha sinatura non válida."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv "
 "instalado?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Erro descoñecido ao executar gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran válidas:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2068,16 +2091,6 @@ msgstr ""
 "Non se puido verificar as seguintes sinaturas porque a chave pública non "
 "está dispoñible:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Non se puido abrir unha canle para %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Erro de lectura do proceso %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "A agardar polas cabeceiras"
@@ -2139,19 +2152,19 @@ msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Non se puido truncar o ficheiro"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "A conexión fallou"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2186,11 +2199,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2217,7 +2235,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Non se atopou a selección %s"
@@ -2349,152 +2367,169 @@ msgstr "Non se pode cambiar a %s"
 msgid "Failed to stat the cdrom"
 msgstr "Non se puido analizar o CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Non se puido abrir o ficheiro de bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Non se puido obter o bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O subproceso %s recibiu un fallo de segmento."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O subproceso %s recibiu un fallo de segmento."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O subproceso %s devolveu un código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O subproceso %s saíu de xeito inesperado"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Non se puido abrir o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Non se puido abrir unha canle para %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escritura, aínda hai %lu para escribir pero non se puido"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problema ao pechar o ficheiro"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Problema ao pechar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problema ao sincronizar o ficheiro"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problema ao borrar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problema ao sincronizar o ficheiro"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Caché de paquetes baleira"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de caché de paquetes está corrompido"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "O ficheiro de caché de paquetes é unha versión incompatible"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT non soporta o sistema de versionamento \"%s\""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "A caché de paquetes construiuse para unha arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Suxire"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Conflicto con"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Substitúe a"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Fai obsoleto a"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "requirido"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2524,7 +2559,7 @@ msgstr "Non se puido abrir o ficheiro de estado %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Non se puido gravar o ficheiro de estado temporal %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2609,7 +2644,7 @@ msgstr "Liña %u mal formada na lista de fontes %s (tipo)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2658,7 +2693,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2708,12 +2743,12 @@ msgstr "O método %s non se iniciou correctamente"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "O sistema de empaquetamento \"%s\" non está soportado"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado"
 
@@ -2726,144 +2761,166 @@ msgstr "Non se pode analizar %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe introducir algúns URIs fonte no seu ficheiro sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Non se puido analizar ou abrir as listas de paquetes ou ficheiro de estado."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pode querer executar apt-get update para corrixir estes problemas"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira "
 "Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Non se entendeu o tipo de inmobilización %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "A caché ten un sistema de versionamento incompatible"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Ocorreu un erro ao procesar %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Ocorreu un erro ao procesar %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Ocorreu un erro ao procesar %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Ocorreu un erro ao procesar %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Ocorreu un erro ao procesar %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Ocorreu un erro ao procesar %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Ocorreu un erro ao procesar %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Ocorreu un erro ao procesar %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Guau, superou o número de versións que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Guau, superou o número de descricións que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Guau, superou o número de dependencias que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Ocorreu un erro ao procesar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Non se atopou a lista de paquetes fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "A recoller as provisións de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Erro de E/S ao gravar a caché de fontes"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "fallou o cambio de nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Os MD5Sum non coinciden"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Os \"hashes\" non coinciden"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2872,7 +2929,7 @@ msgstr ""
 "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man. (Falla a arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2881,7 +2938,7 @@ msgstr ""
 "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2889,25 +2946,35 @@ msgstr ""
 "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Nota, escóllese %s no canto de %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Liña non válida no ficheiro de desvíos: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2960,8 +3027,8 @@ msgstr "A buscar os ficheiros de índices no disco..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Atopáronse %zu índices de paquetes, %zu índices de fontes, %zu índices de "
 "traducións e %zu sinaturas\n"
@@ -3002,147 +3069,186 @@ msgstr "A gravar a nova lista de fontes\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas da lista de fontes deste disco son:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Graváronse %i rexistros.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non "
 "coinciden\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "A abrir o ficheiro de configuración %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Os \"hashes\" non coinciden"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "A eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Eliminouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "A executar o disparador de post-instalación %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "O directorio \"%s\" falla"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Non se puido abrir o ficheiro %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempaquetar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A se preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A se preparar para a eliminación de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Eliminouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A se preparar para eliminar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Eliminouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts "
 "non estaba montado?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Non se puido bloquear o directorio de listas"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3160,10 +3266,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Non se atopou a versión \"%s\" de \"%s\""
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Non se atopou a versión \"%s\" de \"%s\""
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Non se puido atopar a tarefa %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Non se puido abrir unha canle para %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Erro de lectura do proceso %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Ocorreu un erro ao procesar %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)"
 
diff --git a/po/hu.po b/po/hu.po
index a14241827..4770724f0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-05-11 14:49+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,148 +20,147 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Az alábbi csomag nem található: %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Csomagnevek összesen : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Csomagnevek összesen : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normális csomagok: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Teljesen virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Egyedi virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Vegyes virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Hiányzik: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Különböző verziók összesen: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Összes külső leírás: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Függőségek összesen: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Verzió/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Összes Leírás/Fájl kapcsolat: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "\"Előkészít\" kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Minták összesen: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Függőségi-verzió terület összesen: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Slack terület összesen: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Terület összesen: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s csomag fájl szinkronon kívül."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Pontosan egy mintát kell megadnod"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nem találtam csomagokat"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Az alábbi csomag nem található: %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Csomagfájlok:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomag fájlra"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Rögzített csomagok:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nem találtam)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Telepítve: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Jelölt: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(nincs)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Csomag Tű: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s erre: %s ekkor fordult: %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -182,6 +182,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -314,12 +315,12 @@ msgstr ""
 "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
 "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nem lehet írni ebbe: %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?"
 
@@ -656,79 +657,79 @@ msgstr "Hiba %s elláncolásakor"
 msgid "Failed to rename %s to %s"
 msgstr "Nem sikerült átnevezni %s-t erre: %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex fordítási hiba - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "de %s van telepítve"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "de csak %s telepíthető"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "de az nem telepíthető"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "de az egy virtuális csomag"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "de az nincs telepítve"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "de az nincs telepítésre megjelölve"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " vagy"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Az alábbi csomagok vissza lesznek tartva:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Az alábbi csomagok frissítve lesznek:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Az alábbi visszafogott csomagokat cserélem:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s miatt) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -736,140 +737,232 @@ msgstr ""
 "FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n"
 "NE tedd ezt, míg nem tudod pontosan, mit csinálsz!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu frissített, %lu újonnan telepített, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu újratelepítendő, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu kerül öregbítésre, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu eltávolítandó és %lu nem frissített.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Telepítve]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Lehetséges verziók"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Egyet név szerint ki kell jelölnöd a telepítésre."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"%s csomag nem elérhető, de egy másik hivatkozik rá\n"
+".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "De az alábbi csomagok felváltják:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s már a legújabb verzió.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s kézi telepítésre állított.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Függőségek javítása..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " sikertelen."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Nem lehet javítani a függőségeket"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Kész"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Teljesítetlen függőségek. Próbáld a -f használatával."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "A hitelesítési figyelmeztetést átléptem.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Néhány csomag nem hitelesíthető"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem zárult"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "A források listája olvashatatlan."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Letöltendő az archívumokból: %sB/%sB\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Letöltés az archívumokból: %sB\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "E művelet után további %sB lemez-területetet használok fel.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nincs elég szabad hely itt:  %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Igen, tedd amit mondok!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -880,28 +973,28 @@ msgstr ""
 "A folytatáshoz írd be ezt: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Megszakítva."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Folytatni akarod [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "A letöltés befejeződött a 'csak letöltés' módban"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -909,125 +1002,56 @@ msgstr ""
 "Nem lehet letölteni néhány archívumot.\n"
 " Próbáld ki az apt-get update -et vagy a --fix-missing -et."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing és média csere jelenleg nem támogatott"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Nem lehet javítani a hiányzó csomagokat."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Telepítés megszakítása."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Telepítve]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Lehetséges verziók"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Egyet név szerint ki kell jelölnöd a telepítésre."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"%s csomag nem elérhető, de egy másik hivatkozik rá\n"
-".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "De az alábbi csomagok felváltják:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s már a legújabb verzió.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%s' kiadás ehhez: '%s' nem található"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%s' verzió ehhez: '%s' nem található"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1036,18 +1060,18 @@ msgid_plural ""
 "required:"
 msgstr[0] "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, 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"
 msgstr[0] "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Töröld az 'apt-get autoremove' paranccsal!"
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1065,43 +1089,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Belső hiba, AllUpgrade megsértett valamit"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Hiányzó %s feladat"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Az alábbi csomag nem található: %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s kézi telepítésre állított.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1109,7 +1113,7 @@ msgstr ""
 "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
 "(vagy telepítsd a függőségeket is!)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1121,122 +1125,147 @@ msgstr ""
 "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
 "lett mozdítva az Incoming-ból."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Az alábbi csomag nem található: %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s kézi telepítésre állított.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Frissítés kiszámítása... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Kész"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, hibafeloldó gond"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Nem tudom zárolni a letöltési könyvtárat"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A már letöltött '%s' fájl kihagyása\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nincs elég szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB forrás-archívumot kell letölteni.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' kibontási parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s' elkészítési parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
 "kell"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nincs fordítási függősége a következőnek: %s.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1245,7 +1274,7 @@ msgstr ""
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
 "található"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1254,32 +1283,32 @@ msgstr ""
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
 "verzió-követelményt kielégítő elérhető verziója."
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
 "friss."
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s építési függőségei nem elégíthetőek ki."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1304,6 +1333,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1364,7 +1395,7 @@ msgstr ""
 "további információkért és opciókért.\n"
 "                   Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1610,9 +1641,9 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s nem olvasható"
@@ -1641,10 +1672,9 @@ msgstr "%sinfo nem érhető el"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Csomaglisták olvasása"
 
@@ -1777,12 +1807,12 @@ msgstr "Nem találom a lemezt"
 msgid "File not found"
 msgstr "Nem találom a fájlt"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Nem érhető el"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "A módosítási időt beállítása sikertelen"
 
@@ -1844,7 +1874,7 @@ msgstr "Időtúllépés a kapcsolatban"
 msgid "Server closed the connection"
 msgstr "A kiszolgáló lezárta a kapcsolatot"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Olvasási hiba"
 
@@ -1856,197 +1886,179 @@ msgstr "A válasz túlcsordította a puffert."
 msgid "Protocol corruption"
 msgstr "Protokoll hiba"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Írási hiba"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Nem lehet létrehozni a socket-et"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időt"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Nem lehet kapcsolódni a passzív sockethez."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "A getaddrinfo nem talált figyelő socketet"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Nem lehet összekapcsolódni a sockettel"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Nem lehet figyelni a socketen"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Nem lehet megállapítani a socket nevét"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Nem lehet PORT parancsot küldeni"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ismeretlen %u címcsalád (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Hibás EPRT, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Az adat sockethez kapcsolódás túllépte az időt"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Az adat socket túllépte az időt"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Adatátvitel sikertelen, a kiszolgáló üzenete: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Lekérdezés"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Nem lehet meghívni "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Csatlakozás: %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kapcsolódás: %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nem lehet feloldani a következőt: '%s' "
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Átmeneti hiba '%s' feloldása közben"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Sikertelen kapcsolódás ide: %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Telepítés megszakítása."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "1 vagy több érvénytelen aláírást találtam."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Ismeretlen gpgv futtatási hiba"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Az alábbi aláírások nem igazolhatók, mert a nyilvános kulcs nem elérhető:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Nem lehet csövet nyitni ehhez: %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Olvasási hiba %s folyamattól"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
@@ -2108,20 +2120,20 @@ msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s fájl írása sikertelen"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Rossz fejlécadat"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Belső hiba"
 
@@ -2157,11 +2169,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2188,7 +2205,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s kiválasztás nem található"
@@ -2320,152 +2337,169 @@ msgstr "Nem sikerült ide váltani: %s"
 msgid "Failed to stat the cdrom"
 msgstr "Nem sikerült elérni a CD-ROM-ot."
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s zárolási fájl nem nyitható meg"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nem sikerült zárolni: %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s nem volt itt, ahogy vártam"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s alfolyamat szegmentálási hibát okozott."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s alfolyamat szegmentálási hibát okozott."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s alfolyamat hibakóddal tért vissza (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s alfolyamat váratlanul kilépett"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nem lehet megnyitni %s fájlt"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nem lehet csövet nyitni ehhez: %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "olvasás, még kellene %lu, de már az összes elfogyott"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "írás, még kiírandó %lu de ez nem lehetséges"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Hiba a fájl bezárásakor"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Hiba a fájl bezárásakor"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Hiba a fájl szinkronizálásakor"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Hiba a fájl leválasztásával"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Hiba a fájl szinkronizálásakor"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Üres csomag-gyorstár"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "A csomag-gyorstár fájl megsérült"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "A csomag-gyorstár fájl inkompatibilis verziójú"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ez az APT nem támogatja a(z) '%s' verziórendszert"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "A csomag-gyorstár egy másik architektúrához készült"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Függ ettől"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Függ ettől (előfüggés)"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Javasolja"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Ajánlja"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Ütközik"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Kicseréli"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Elavulttá teszi"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Töri"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "fontos"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "szükséges"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "szabványos"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcionális"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2495,7 +2529,7 @@ msgstr "%s állapot-fájl megnyitása sikertelen"
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s átmeneti állapot-fájl írása sikertelen"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2580,7 +2614,7 @@ msgstr "A(z) %u. sor hibás %s forráslistában (típus)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2630,7 +2664,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2680,12 +2714,12 @@ msgstr "A(z) %s metódus nem indult el helyesen"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "A(z) '%s' csomagrendszer nem támogatott"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "A megfelelő csomagrendszer típus nem határozható meg"
 
@@ -2698,146 +2732,168 @@ msgstr "%s nem érhető el."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "A csomaglista vagy az állapot fájl nem dolgozható fel vagy nem olvasható."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "A(z) %s tűtípus nem értelmezhető"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Hiba történt %s feldolgozásakor (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Hiba történt %s feldolgozásakor (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!"
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!"
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni tud!"
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
 
 # FIXME
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "\"Előkészít\" kapcsolatok összegyűjtése"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO hiba a forrás-gyorsítótár mentésekor"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "sikertelen átnevezés, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Az MD5Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "A Hash Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2846,7 +2902,7 @@ msgstr ""
 "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
 "kell kijavítani a csomagot. (hiányzó arch. miatt)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2855,32 +2911,42 @@ msgstr ""
 "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
 "kell kijavítani a csomagot."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "A méret nem megfelelő"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Érvénytelen sor az eltérítő fájlban: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2933,8 +2999,8 @@ msgstr "Indexfájlok keresése a lemezen...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "%zu csomag-indexet, %zu forrás-indexet, %zu fordítás-indexet és %zu aláírást "
 "találtam\n"
@@ -2975,143 +3041,182 @@ msgstr "Új forráslista írása\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rekord kiírva.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i rekord kiírva %i hibásan párosított fájllal\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "%s konfigurációs fájl megnyitása"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "A Hash Sum nem megfelelő"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Telepített %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfigurálása"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltávolítása"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s teljesen eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Hiányzik ez a könyvtár: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nem lehet megnyitni %s fájlt"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s kicsomagolása"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfigurálásának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Telepített %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s eltávolításának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Eltávolított %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s teljes eltávolítása előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nem tudom a listakönyvtárat zárolni"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3129,10 +3234,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "A kapcsolat idő előtt lezárult"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "'%s' kiadás ehhez: '%s' nem található"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "'%s' verzió ehhez: '%s' nem található"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Hiányzó %s feladat"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nem lehet csövet nyitni ehhez: %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Olvasási hiba %s folyamattól"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)"
 
@@ -3182,8 +3308,8 @@ msgstr "A kapcsolat idő előtt lezárult"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n"
 
 #, fuzzy
diff --git a/po/it.po b/po/it.po
index 8fde74e5b..00594bcee 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,152 +8,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2010-05-15 20:33+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Il pacchetto %s versione %s ha una dipendenza non soddisfatta:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossibile trovare il pacchetto %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Totale nomi dei pacchetti: "
 
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:286
+#, fuzzy
+msgid "Total package structures: "
+msgstr "Totale nomi dei pacchetti: "
+
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Pacchetti normali: "
 
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Pacchetti virtuali puri: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pacchetti virtuali singoli: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Pacchetti virtuali misti: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Mancante: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Totale versioni distinte: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Totale descrizioni distinte: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Totale dipendenze: "
 
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Totale relazioni ver/file: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Totale relazioni Desc/File: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Totale corrispondenze fornite: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Totale stringhe globalizzate: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Totale spazio di dipendenza di versione: "
 
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Totale spazio inutilizzato: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Totale spazio occupato: "
 
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Il file dei pacchetti %s non è sincronizzato."
 
-#: cmdline/apt-cache.cc:1297
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "È necessario specificare un solo modello"
 
-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nessun pacchetto trovato"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossibile trovare il pacchetto %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "File dei pacchetti:"
 
-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pacchetti con gancio:"
 
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(non trovato)"
 
-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installato: "
 
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
-msgstr "(nessuno)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+msgid "(none)"
+msgstr "(nessuno)"
+
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Gancio del pacchetto: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per %s compilato il %s %s\n"
 
-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -174,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -238,7 +244,12 @@ msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\""
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Inserire un disco nell'unità e premere Invio"
 
-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:127
+#, fuzzy, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Rinomina di %s in %s non riuscita"
+
+#: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ripetere questo processo per il resto dei CD."
 
@@ -303,40 +314,40 @@ msgstr ""
 "  -c=? Legge come configurazione il file specificato\n"
 "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossibile scrivere in %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Impossibile trovare la versione di debconf. È installato?"
 
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
 msgid "Package extension list is too long"
 msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
 
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
 #, c-format
 msgid "Error processing directory %s"
 msgstr "Errore nell'elaborare la directory %s"
 
-#: ftparchive/apt-ftparchive.cc:251
+#: ftparchive/apt-ftparchive.cc:258
 msgid "Source extension list is too long"
 msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
 
-#: ftparchive/apt-ftparchive.cc:368
+#: ftparchive/apt-ftparchive.cc:375
 msgid "Error writing header to contents file"
 msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
 
-#: ftparchive/apt-ftparchive.cc:398
+#: ftparchive/apt-ftparchive.cc:405
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Errore nell'elaborare i contenuti %s"
 
-#: ftparchive/apt-ftparchive.cc:553
+#: ftparchive/apt-ftparchive.cc:590
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -417,11 +428,11 @@ msgstr ""
 "  -c=?        Legge come configurazione il file specificato\n"
 "  -o=?        Imposta un'opzione arbitraria di configurazione"
 
-#: ftparchive/apt-ftparchive.cc:759
+#: ftparchive/apt-ftparchive.cc:796
 msgid "No selections matched"
 msgstr "Nessuna selezione corrisponde"
 
-#: ftparchive/apt-ftparchive.cc:832
+#: ftparchive/apt-ftparchive.cc:874
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
@@ -466,87 +477,87 @@ msgstr "Impossibile ottenere un cursore"
 # (ndt) messo A per Avviso
 # Inizio con la maiuscola dopo i : perché mi sa che in molti
 # casi molte stringhe sono così
-#: ftparchive/writer.cc:76
+#: ftparchive/writer.cc:73
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Impossibile leggere la directory %s\n"
 
-#: ftparchive/writer.cc:81
+#: ftparchive/writer.cc:78
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Impossibile eseguire stat su %s\n"
 
-#: ftparchive/writer.cc:132
+#: ftparchive/writer.cc:134
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:136
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: Errors apply to file "
 msgstr "E: Gli errori si applicano al file "
 
-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Risoluzione di %s non riuscita"
 
-#: ftparchive/writer.cc:170
+#: ftparchive/writer.cc:174
 msgid "Tree walking failed"
 msgstr "Visita dell'albero non riuscita"
 
-#: ftparchive/writer.cc:195
+#: ftparchive/writer.cc:201
 #, c-format
 msgid "Failed to open %s"
 msgstr "Apertura di %s non riuscita"
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:260
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:262
+#: ftparchive/writer.cc:268
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Esecuzione di readlink su %s non riuscita"
 
-#: ftparchive/writer.cc:266
+#: ftparchive/writer.cc:272
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Esecuzione di unlink su %s non riuscita"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Collegamento di %s a %s non riuscito"
 
-#: ftparchive/writer.cc:283
+#: ftparchive/writer.cc:289
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Raggiunto il limite di DeLink di %sB.\n"
 
-#: ftparchive/writer.cc:389
+#: ftparchive/writer.cc:393
 msgid "Archive had no package field"
 msgstr "L'archivio non ha un campo \"package\""
 
-#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ha un campo override\n"
 
-#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  il responsabile di %s è %s non %s\n"
 
-#: ftparchive/writer.cc:638
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s non ha un campo source override\n"
 
-#: ftparchive/writer.cc:642
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s non ha neppure un campo binario override\n"
@@ -646,79 +657,79 @@ msgstr "Problema nell'unlink di %s"
 msgid "Failed to rename %s to %s"
 msgstr "Rinomina di %s in %s non riuscita"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Errore di compilazione dell'espressione regolare - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ma %s è installato"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ma %s sta per essere installato"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ma non è installabile"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ma è un pacchetto virtuale"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ma non è installato"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ma non sta per essere installato"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " oppure"
 
-#: cmdline/apt-get.cc:382
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "I seguenti pacchetti NUOVI saranno installati:"
 
-#: cmdline/apt-get.cc:408
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "I seguenti pacchetti saranno RIMOSSI:"
 
-#: cmdline/apt-get.cc:430
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
 
-#: cmdline/apt-get.cc:451
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "I seguenti pacchetti saranno aggiornati:"
 
-#: cmdline/apt-get.cc:472
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "I seguenti pacchetti saranno RETROCESSI:"
 
-#: cmdline/apt-get.cc:492
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "I seguenti pacchetti bloccati saranno cambiati:"
 
-#: cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (a causa di %s) "
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,151 +738,243 @@ msgstr ""
 "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
 "si sta facendo."
 
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aggiornati, %lu installati, "
 
-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstallati, "
 
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu retrocessi, "
 
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu da rimuovere e %lu non aggiornati.\n"
 
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non completamente installati o rimossi.\n"
 
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versione %s (%s) selezionata per %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installato]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versioni candidate"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "È necessario sceglierne uno da installare."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n"
+"pacchetto. Questo può significare che il pacchetto è mancante, è obsoleto\n"
+"oppure è disponibile solo all'interno di un'altra sorgente\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Tuttavia questi pacchetti lo sostituiscono:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Il pacchetto %s non ha candidati da installare"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Nota, viene selezionato %s al posto di %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s è già alla versione più recente.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "È stato impostato %s per l'installazione manuale.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Correzione delle dipendenze..."
 
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " non riuscita."
 
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Impossibile correggere le dipendenze"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossibile minimizzare l'insieme da aggiornare"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Fatto"
 
-#: cmdline/apt-get.cc:684
-msgid "You might want to run `apt-get -f install' to correct these."
+#: cmdline/apt-get.cc:949
+#, fuzzy
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "È utile eseguire \"apt-get -f install\" per correggere questi problemi."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dipendenze non trovate. Riprovare usando -f."
 
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
 
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Avviso di autenticazione disabilitato.\n"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installare questi pacchetti senza verificarli [s/N]? "
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Alcuni pacchetti non possono essere autenticati"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
 
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Errore interno, InstallPackages è stato chiamato con un pacchetto "
 "danneggiato."
 
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Errore interno, l'ordinamento non è stato terminato"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
-msgid "Unable to lock the download directory"
-msgstr "Impossibile bloccare la directory di scaricamento"
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Impossibile leggere l'elenco dei sorgenti."
 
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:841
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "È necessario scaricare %sB/%sB di archivi.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "È necessario scaricare %sB di archivi.\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
 
-#: cmdline/apt-get.cc:852
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
 
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero su %s"
 
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Spazio libero in %s insufficiente."
 
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "È stata specificata la modalità \"Trivial Only\", ma questa non è "
 "un'operazione banale."
 
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Sì, esegui come da richiesta."
 
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -882,28 +985,28 @@ msgstr ""
 "Per continuare scrivere la frase \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Interrotto."
 
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Continuare [S/n]? "
 
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossibile recuperare %s  %s\n"
 
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Scaricamento completato e in modalità solo scaricamento"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -911,143 +1014,88 @@ msgstr ""
 "Impossibile recuperare alcuni pacchetti. Potrebbe essere utile eseguire "
 "\"apt-get update\" o provare l'opzione \"--fix-missing\"."
 
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing su supporti estraibili non è ancora supportato"
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Impossibile correggere i pacchetti mancanti."
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Interruzione dell'installazione."
 
-#: cmdline/apt-get.cc:1086
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, viene selezionato %s al posto di %s\n"
-
-#: cmdline/apt-get.cc:1097
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
-
-#: cmdline/apt-get.cc:1115
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n"
-
-#: cmdline/apt-get.cc:1126
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
-
-#: cmdline/apt-get.cc:1138
-msgid " [Installed]"
-msgstr " [Installato]"
-
-#: cmdline/apt-get.cc:1143
-msgid "You should explicitly select one to install."
-msgstr "È necessario sceglierne uno da installare."
-
-#: cmdline/apt-get.cc:1148
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n"
-"pacchetto. Questo può significare che il pacchetto è mancante, è obsoleto\n"
-"oppure è disponibile solo all'interno di un'altra sorgente\n"
-
-#: cmdline/apt-get.cc:1167
-msgid "However the following packages replace it:"
-msgstr "Tuttavia questi pacchetti lo sostituiscono:"
-
-#: cmdline/apt-get.cc:1170
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Il pacchetto %s non ha candidati da installare"
-
-#: cmdline/apt-get.cc:1190
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
-
-#: cmdline/apt-get.cc:1198
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s è già alla versione più recente.\n"
-
-# (ndt) dovrebbe essere inteso il file Release
-#: cmdline/apt-get.cc:1227
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release \"%s\" per \"%s\" non trovato."
-
-# (ndt) dovrebbe essere inteso il Version
-#: cmdline/apt-get.cc:1229
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version \"%s\" per \"%s\" non trovato"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1235
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Versione %s (%s) selezionata per %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorato il rilascio non disponibile \"%s\" del pacchetto \"%s\""
 
-#: cmdline/apt-get.cc:1352
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\""
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Il comando update non accetta argomenti"
 
-#: cmdline/apt-get.cc:1418
-msgid "Unable to lock the list directory"
-msgstr "Impossibile bloccare la directory"
-
-#: cmdline/apt-get.cc:1474
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
 
-#: cmdline/apt-get.cc:1523
+#: 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:"
-msgstr ""
+msgstr[0] ""
+"I seguenti pacchetti sono stati installati automaticamente e non sono più "
+"richiesti:"
+msgstr[1] ""
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 
-#: cmdline/apt-get.cc:1525
-#, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr ""
+#: cmdline/apt-get.cc:1657
+#, fuzzy, 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"
+msgstr[0] ""
+"%lu pacchetti sono stati installati automaticamente e non sono più "
+"richiesti.\n"
+msgstr[1] ""
 "%lu pacchetti sono stati installati automaticamente e non sono più "
 "richiesti.\n"
 
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Usare \"apt-get autoremove\" per rimuoverli."
 
-#: cmdline/apt-get.cc:1531
+#: 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."
@@ -1065,44 +1113,25 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
 
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
 
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
 
-#: cmdline/apt-get.cc:1612
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Impossibile trovare il task %s"
-
-#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Impossibile trovare il pacchetto %s"
-
-#: cmdline/apt-get.cc:1750
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
-
-#: cmdline/apt-get.cc:1781
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "È stato impostato %s per l'installazione manuale.\n"
-
-#: cmdline/apt-get.cc:1794
-msgid "You might want to run `apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc:1779
+#, fuzzy
+msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
 
-#: cmdline/apt-get.cc:1797
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1110,7 +1139,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 
-#: cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1122,118 +1151,147 @@ msgstr ""
 "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
 "non sono ancora stati creati o sono stati rimossi da Incoming."
 
-#: cmdline/apt-get.cc:1827
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Pacchetto danneggiato"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 
-#: cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Impossibile trovare il pacchetto %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "È stato impostato %s per l'installazione manuale.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento... "
 
-#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cmdline/apt-get.cc:1983
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Eseguito"
 
-#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
+msgid "Unable to lock the download directory"
+msgstr "Impossibile bloccare la directory di scaricamento"
+
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
 
-#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
 
-#: cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Lo spazio libero in %s è insufficiente"
 
-#: cmdline/apt-get.cc:2278
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
 
-#: cmdline/apt-get.cc:2281
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "È necessario recuperare %sB di sorgenti\n"
 
-#: cmdline/apt-get.cc:2287
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Recupero sorgente %s\n"
 
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 
-#: cmdline/apt-get.cc:2346
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
 
-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando \"%s\" di generazione non riuscito.\n"
 
-#: cmdline/apt-get.cc:2395
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "È necessario specificare almeno un pacchetto di cui controllare le "
 "dipendenze di generazione"
 
-#: cmdline/apt-get.cc:2439
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
 
-#: cmdline/apt-get.cc:2459
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di generazione.\n"
 
-#: cmdline/apt-get.cc:2511
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1242,7 +1300,7 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
 "non può essere trovato"
 
-#: cmdline/apt-get.cc:2564
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1251,32 +1309,33 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
 "del pacchetto %s può soddisfare le richieste di versione"
 
-#: cmdline/apt-get.cc:2600
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
 "è troppo nuovo"
 
-#: cmdline/apt-get.cc:2627
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
 
-#: cmdline/apt-get.cc:2643
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
 
-#: cmdline/apt-get.cc:2648
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
-#: cmdline/apt-get.cc:2680
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:2721
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1300,6 +1359,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1362,7 +1423,7 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5).\n"
 "                       Questo APT ha i poteri della Super Mucca.\n"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1618,10 +1679,10 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
-#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
-#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
-#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
@@ -1650,10 +1711,9 @@ msgstr "Esecuzione di stat su %sinfo non riuscita"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Le directory temp e info devono essere sullo stesso file system"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
-#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
-#: apt-pkg/pkgcachegen.cc:1008
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Lettura elenco dei pacchetti"
 
@@ -1757,12 +1817,12 @@ msgstr "Impossibile localizzare un file \"control\" valido"
 msgid "Unparsable control file"
 msgstr "File \"control\" non analizzabile"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:199
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Impossibile leggere il database del CD-ROM %s"
 
-#: methods/cdrom.cc:209
+#: methods/cdrom.cc:208
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
@@ -1770,7 +1830,7 @@ msgstr ""
 "Usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-get update non "
 "può essere usato per aggiungere nuovi CD-ROM"
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:218
 msgid "Wrong CD-ROM"
 msgstr "CD-ROM sbagliato"
 
@@ -1787,12 +1847,12 @@ msgstr "Disco non trovato"
 msgid "File not found"
 msgstr "File non trovato"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Esecuzione di stat non riuscita"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Impostazione della data di modifica non riuscita"
 
@@ -1855,7 +1915,7 @@ msgstr "Connessione scaduta"
 msgid "Server closed the connection"
 msgstr "Il server ha chiuso la connessione"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Errore di lettura"
 
@@ -1867,186 +1927,178 @@ msgstr "Una risposta ha superato le dimensioni del buffer."
 msgid "Protocol corruption"
 msgstr "Protocollo danneggiato"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Errore di scrittura"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Impossibile creare un socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Impossibile connettersi al socket dati, connessione terminata"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Impossibile connettere socket passivo."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Impossibile eseguire bind() su un socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Impossibile eseguire listen() su un socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Impossibile determinare il nome del socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Impossibile inviare il comando PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Connessione al socket dati terminata"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Socket dati terminato"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Interrogazione"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Impossibile invocare "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Connessione a %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata"
 
-#: methods/connect.cc:119
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Impossibile connettersi a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:147 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione a %s"
 
-#: methods/connect.cc:166 methods/connect.cc:185
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Impossibile risolvere \"%s\""
 
-#: methods/connect.cc:191
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 "Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
 
-#: methods/connect.cc:241
+#: methods/connect.cc:243
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossibile connettersi a %s:%s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Nessun portachiavi installato in %s."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr "E: Troppi portachiavi verrebbero passati a gpgv. Uscita."
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Errore interno: firma corretta, ma non è possibile determinare l'impronta "
 "della chiave."
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "È stata trovata almeno una firma non valida."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Impossibile eseguire \"%s\" per verificare la firma (forse gpgv non è "
 "installato)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2054,16 +2106,6 @@ msgstr ""
 "Le seguenti firme non sono state verificate perché la chiave pubblica non è "
 "disponibile:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Impossibile aprire una pipe per %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Errore di lettura dal processo %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
@@ -2097,60 +2139,75 @@ msgstr "Questo server HTTP ha un supporto del range non corretto"
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/http.cc:791
+#: methods/http.cc:793
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:796
+#: methods/http.cc:798
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:819
+#: methods/http.cc:821
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
-#: methods/http.cc:850
+#: methods/http.cc:852
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:878
+#: methods/http.cc:880
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:892
+#: methods/http.cc:894
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
 
-#: methods/http.cc:894
+#: methods/http.cc:896
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Troncamento del file non riuscito"
 
-#: methods/http.cc:1150
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/http.cc:1167 methods/http.cc:1222
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/http.cc:1314
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:77
 msgid "Can't mmap an empty file"
 msgstr "Impossibile eseguire mmap su un file vuoto"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:89
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Impossibile aprire una pipe per %s"
+
+#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Impossibile eseguire mmap di %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:124
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Impossibile aprire %s"
+
+#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Impossibile invocare "
+
+#: apt-pkg/contrib/mmap.cc:300
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2159,40 +2216,43 @@ msgstr ""
 "MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
 "valore attuale è: %lu (man 5 apt.conf)."
 
-#: apt-pkg/contrib/mmap.cc:347
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"La dimensione di una MMap ha già raggiunto il limite definito di %lu byte. "
-"Annullare la prova per aumentarne la dimensione."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/contrib/strutl.cc:371
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lig %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/contrib/strutl.cc:390
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"
@@ -2244,7 +2304,14 @@ msgstr "Errore di sintassi %s:%u: incluso da qui"
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
 
-#: apt-pkg/contrib/configuration.cc:825
+#: apt-pkg/contrib/configuration.cc:777
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello "
+"più alto"
+
+#: apt-pkg/contrib/configuration.cc:827
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
@@ -2275,34 +2342,34 @@ msgstr "Opzione a riga di comando %s non comprensibile"
 msgid "Command line option %s is not boolean"
 msgstr "Opzione a riga di comando %s non booleana"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "L'opzione %s richiede un argomento."
 
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "Opzione %s: la specifica di configurazione dell'oggetto deve avere un "
 "=<valore>."
 
-#: apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc:236
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
 
-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:267
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opzione \"%s\" troppo lunga"
 
-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:300
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
 
-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:350
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operazione %s non valida"
@@ -2312,192 +2379,214 @@ msgstr "Operazione %s non valida"
 msgid "Unable to stat the mount point %s"
 msgstr "Impossibile eseguire stat sul punto di mount %s"
 
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
+#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossibile passare a %s"
 
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:204
 msgid "Failed to stat the cdrom"
 msgstr "Esecuzione di stat sul CD-ROM non riuscita"
 
-#: apt-pkg/contrib/fileutl.cc:151
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
 
-#: apt-pkg/contrib/fileutl.cc:156
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossibile aprire il file di blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
 
-#: apt-pkg/contrib/fileutl.cc:178
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossibile impostare il blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:568
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "In attesa di %s ma non era presente"
 
-#: apt-pkg/contrib/fileutl.cc:580
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:582
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
 
-#: apt-pkg/contrib/fileutl.cc:586
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:588
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Il sottoprocesso %s è uscito inaspettatamente"
 
-#: apt-pkg/contrib/fileutl.cc:632
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossibile aprire il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Impossibile aprire il file %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno"
 
-#: apt-pkg/contrib/fileutl.cc:718
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 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:793
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Si è verificato un problema nel chiudere il file"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Si è verificato un problema nel chiudere il file"
 
-#: apt-pkg/contrib/fileutl.cc:799
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Si è verificato un problema nel sincronizzare il file"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Si è verificato un problema nell'eseguire l'unlink del file"
 
-#: apt-pkg/contrib/fileutl.cc:810
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Si è verificato un problema nel sincronizzare il file"
 
-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Cache dei pacchetti vuota"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Il file della cache dei pacchetti è danneggiato"
 
-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "La versione del file della cache dei pacchetti è incompatibile"
 
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Questo APT non supporta il sistema di versione \"%s\""
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr ""
 "Il file della cache dei pacchetti è stato generato per un'altra architettura"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Dipende"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Pre-dipende"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Consiglia"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Raccomanda"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Va in conflitto"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Sostituisce"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Rende obsoleto"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Migliora"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "richiesto"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opzionale"
 
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
 msgid "Building dependency tree"
 msgstr "Generazione albero delle dipendenze"
 
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:125
 msgid "Candidate versions"
 msgstr "Versioni candidate"
 
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:154
 msgid "Dependency generation"
 msgstr "Generazione delle dipendenze"
 
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
 msgid "Reading state information"
 msgstr "Lettura informazioni sullo stato"
 
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:236
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Apertura del file di stato %s non riuscita"
 
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:242
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
+#: apt-pkg/depcache.cc:921
+#, c-format
+msgid "Internal error, group '%s' has no installable pseudo package"
+msgstr ""
+
 #: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
@@ -2508,57 +2597,77 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossibile analizzare il file di pacchetto %s (2)"
 
-#: apt-pkg/sourcelist.cc:83
+#: apt-pkg/sourcelist.cc:92
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+
+#: apt-pkg/sourcelist.cc:95
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "La riga %lu nel file %s non è corretta (dist)"
+
+#: apt-pkg/sourcelist.cc:106
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+
+#: apt-pkg/sourcelist.cc:115
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+
+#: apt-pkg/sourcelist.cc:128
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "La riga %lu nel file %s non è corretta (URI)"
 
-#: apt-pkg/sourcelist.cc:85
+#: apt-pkg/sourcelist.cc:130
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "La riga %lu nel file %s non è corretta (dist)"
 
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:133
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "La riga %lu nel file %s non è corretta (URI parse)"
 
-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:139
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:146
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "La riga %lu nel file %s non è corretta (dist parse)"
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:244
 #, c-format
 msgid "Opening %s"
 msgstr "Apertura di %s"
 
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Riga %u troppo lunga nel file %s."
 
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:281
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "La riga %u nel file %s non è corretta (type)"
 
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
 
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "La riga %u nel file %s non è corretta (vendor id)"
-
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2568,7 +2677,7 @@ msgstr ""
 "informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::Immediate-"
 "Configure\" (%d)."
 
-#: apt-pkg/packagemanager.cc:440
+#: apt-pkg/packagemanager.cc:452
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2580,7 +2689,7 @@ msgstr ""
 "situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
 "APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:478
+#: apt-pkg/packagemanager.cc:495
 #, c-format
 msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2595,7 +2704,7 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "Il file indice di tipo \"%s\" non è supportato"
 
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:292
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2603,7 +2712,7 @@ msgstr ""
 "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
 "archivio."
 
-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1182
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2611,12 +2720,12 @@ msgstr ""
 "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
 "potrebbe essere causato da pacchetti bloccati."
 
-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1184
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
 
-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2624,24 +2733,29 @@ msgstr ""
 "Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
 "usati quelli vecchi."
 
-#: apt-pkg/acquire.cc:60
-#, c-format
-msgid "Lists directory %spartial is missing."
+#: apt-pkg/acquire.cc:79
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
 msgstr "Manca la directory di liste %spartial."
 
-#: apt-pkg/acquire.cc:64
-#, c-format
-msgid "Archive directory %spartial is missing."
+#: apt-pkg/acquire.cc:83
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
 msgstr "Manca la directory di archivio %spartial."
 
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Impossibile bloccare la directory"
+
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:878
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Scaricamento file %li di %li (%s rimanente)"
 
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:880
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Scaricamento file %li di %li"
@@ -2661,12 +2775,12 @@ msgstr "Il metodo %s non si è avviato correttamente"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
 
-#: apt-pkg/init.cc:133
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Il sistema di pacchetti \"%s\" non è supportato"
 
-#: apt-pkg/init.cc:149
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
 
@@ -2680,149 +2794,171 @@ msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "L'elenco dei pacchetti o il file di stato non può essere letto o aperto."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "È consigliato eseguire \"apt-get update\" per correggere questi problemi"
 
-#: apt-pkg/policy.cc:316
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package"
 "\""
 
-#: apt-pkg/policy.cc:338
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Impossibile comprendere il tipo di gancio %s"
 
-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Priorità per il gancio non specificata (o zero)"
 
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
 
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Si è verificato un errore nell'elaborare %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Si è verificato un errore nell'elaborare %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:226
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Si è verificato un errore nell'elaborare %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "È stato superato il numero di nomi di pacchetti che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "È stato superato il numero di versioni che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)"
 
 # (ndt) il primo è il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
 "dipendenze"
 
-#: apt-pkg/pkgcachegen.cc:706
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
 
 # (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:808
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Il file fornisce"
 
-#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Errore di I/O nel salvare la cache sorgente"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename() non riuscita: %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5sum non corrispondente"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Somma hash non corrispondente"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2831,7 +2967,7 @@ msgstr ""
 "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
 "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2840,7 +2976,7 @@ msgstr ""
 "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
 "sistemare manualmente questo pacchetto."
 
-#: apt-pkg/acquire-item.cc:1360
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2848,31 +2984,41 @@ msgstr ""
 "L'indice dei file è danneggiato. Manca il campo \"Filename:\" per il "
 "pacchetto %s."
 
-#: apt-pkg/acquire-item.cc:1447
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Le dimensioni non corrispondono"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossibile analizzare il file Release %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Nessuna sezione nel file Release %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Nessuna voce Hash nel file Release %s"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Nessuna voce Hash nel file Release %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nessuna voce Hash nel file Release %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Il blocco vendor %s non contiene impronte"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:518
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -2881,51 +3027,51 @@ msgstr ""
 "Viene usato il punto di mount del CD-ROM %s\n"
 "Montaggio CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
 msgid "Identifying.. "
 msgstr "Identificazione... "
 
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:552
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etichette archiviate: %s \n"
 
-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
 msgid "Unmounting CD-ROM...\n"
 msgstr "Smontaggio CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:578
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Viene usato il punto di mount del CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:596
 msgid "Unmounting CD-ROM\n"
 msgstr "Smontaggio CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:600
 msgid "Waiting for disc...\n"
 msgstr "In attesa del disco...\n"
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:608
 msgid "Mounting CD-ROM...\n"
 msgstr "Montaggio CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:626
 msgid "Scanning disc for index files..\n"
 msgstr "Analisi del disco per file indice...\n"
 
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di "
 "traduzione e %zu firme\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:677
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -2933,16 +3079,16 @@ msgstr ""
 "Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un "
 "disco Debian o potrebbe essere l'architettura errata."
 
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:703
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Trovata l'etichetta \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:732
 msgid "That is not a valid name, try again.\n"
 msgstr "Questo non è un nome valido, riprovare.\n"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:748
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2951,135 +3097,177 @@ msgstr ""
 "Questo disco è chiamato: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:752
 msgid "Copying package lists..."
 msgstr "Copia elenco pacchetti..."
 
-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:778
 msgid "Writing new source list\n"
 msgstr "Scrittura nuovo elenco sorgenti\n"
 
-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:787
 msgid "Source list entries for this disc are:\n"
 msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Scritti %i record.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Scritti %i record con %i file mancanti.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Scritti %i record con %i file senza corrispondenze\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Saltato il file inesistente %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Impossibile trovare il record di autenticazione per %s"
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash non corrispondente per %s"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, c-format
 msgid "Completely removing %s"
 msgstr "Rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Esecuzione comando di post installazione %s"
 
-#: apt-pkg/deb/dpkgpm.cc:558
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Impossibile aprire il file %s"
+
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:662
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparazione alla rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:669
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparazione alla rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
 "è montato)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:909
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "Esecuzione di dpkg"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3088,22 +3276,24 @@ msgstr ""
 "Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
 "altro processo potrebbe tenerla occupata."
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 "Impossibile acquisire il blocco sulla directory di amministrazione (%s). È "
 "necessario essere root."
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg è stato interrotto. È necessario eseguire \"dpkg --configure -a\" per "
 "correggere il problema. "
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Non bloccato"
 
@@ -3125,17 +3315,42 @@ msgstr ""
 "Impossibile applicare la patch a %s con mmap (nessun errore da parte di "
 "mmap). La patch sembra essere danneggiata."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Connessione chiusa prematuramente"
 
-#, fuzzy
-#~ msgid "Failed to mount '%s' to '%s'"
-#~ msgstr "Rinomina di %s in %s non riuscita"
+# (ndt) dovrebbe essere inteso il file Release
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Release \"%s\" per \"%s\" non trovato."
 
-#, fuzzy
-#~ msgid "Could not open file '%s'"
-#~ msgstr "Impossibile aprire il file %s"
+# (ndt) dovrebbe essere inteso il Version
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Version \"%s\" per \"%s\" non trovato"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Impossibile trovare il task %s"
+
+#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+#~ msgstr "E: Troppi portachiavi verrebbero passati a gpgv. Uscita."
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita."
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Errore di lettura dal processo %s"
+
+#~ msgid ""
+#~ "The size of a MMap has already reached the defined limit of %lu bytes,"
+#~ "abort the try to grow the MMap."
+#~ msgstr ""
+#~ "La dimensione di una MMap ha già raggiunto il limite definito di %lu "
+#~ "byte. Annullare la prova per aumentarne la dimensione."
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "La riga %u nel file %s non è corretta (vendor id)"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewVersion2)"
 
 #~ msgid "       %4i %s\n"
 #~ msgstr "       %4i %s\n"
diff --git a/po/ja.po b/po/ja.po
index 9b074d04d..206269268 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,155 +8,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-13 09:26+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8 bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "パッケージ %s が見つかりません"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "パッケージ名総数: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "パッケージ名総数: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  通常パッケージ: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  純粋仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  単一仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  複合仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  欠落: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "個別バージョン総数: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "個別説明総数: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "依存関係総数: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "バージョン/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "説明/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "提供マッピング総数: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Glob 文字列の総数: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "総依存関係・バージョン容量: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "総空き容量: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "総占有容量: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Package ファイル %s が同期していません。"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "パターンはちょうど 1 つだけ指定してください"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "パッケージが見つかりません"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "パッケージ %s が見つかりません"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "パッケージファイル:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pin パッケージ:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(見つかりません)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  インストールされているバージョン: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  候補: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(なし)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  パッケージ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  バージョンテーブル:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s コンパイル日時: %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -177,6 +178,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -310,12 +312,12 @@ msgstr ""
 "  -c=? 指定した設定ファイルを読み込む\n"
 "  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s に書き込めません"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "debconf のバージョンを取得できません。debconf はインストールされていますか?"
@@ -652,79 +654,79 @@ msgstr "%s のリンク解除で問題が発生しました"
 msgid "Failed to rename %s to %s"
 msgstr "%s を %s に名前変更できませんでした"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "以下のパッケージには満たせない依存関係があります:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "しかし、%s はインストールされています"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "しかし、%s はインストールされようとしています"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "しかし、インストールすることができません"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "しかし、これは仮想パッケージです"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "しかし、インストールされていません"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "しかし、インストールされようとしていません"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " または"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "以下のパッケージが新たにインストールされます:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "以下のパッケージは「削除」されます:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "以下のパッケージは保留されます:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "以下のパッケージはアップグレードされます:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "以下のパッケージは「ダウングレード」されます:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "以下の変更禁止パッケージは変更されます:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s のため) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -732,143 +734,240 @@ msgstr ""
 "警告: 以下の不可欠パッケージが削除されます。\n"
 "何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "再インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ダウングレード: %lu 個、"
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "削除: %lu 個、保留: %lu 個。\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [インストール済み]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "候補バージョン"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "インストールするパッケージを明示的に選択する必要があります。"
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"パッケージ %s はデータベースには存在しますが、利用できません。\n"
+"おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
+"あるいは別のソースからのみしか利用できないという状況が考えられます\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "しかし、以下のパッケージで置き換えられています:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "パッケージ %s にはインストール候補がありません"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "注意、%2$s の代わりに %1$s を選択します\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
+"プします。\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
+"プします。\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s はすでに最新バージョンです。\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s は手動でインストールしたと設定されました。\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "依存関係を解決しています ..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " 失敗しました。"
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "依存関係を訂正できません"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "アップグレードセットを最小化できません"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " 完了"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
 "ん。"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "未解決の依存関係があります。-f オプションを試してください。"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告: 以下のパッケージは認証されていません!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "認証の警告は上書きされました。\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "いくつかのパッケージを認証できませんでした"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー、調整が終わっていません"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB のアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "この操作後に %sB のディスク容量が解放されます。\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s の空き領域を測定できません"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s に充分な空きスペースがありません。"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -879,28 +978,28 @@ msgstr ""
 "続行するには、'%s' というフレーズをタイプしてください。\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "中断しました。"
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "続行しますか [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s の取得に失敗しました  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "いくつかのファイルの取得に失敗しました"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -908,131 +1007,58 @@ msgstr ""
 "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
 "missing オプションを付けて試してみてください。"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "足りないパッケージを直すことができません。"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "インストールを中断します。"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "注意、%2$s の代わりに %1$s を選択します\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
-"プします。\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
-"プします。\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [インストール済み]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "候補バージョン"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "インストールするパッケージを明示的に選択する必要があります。"
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"パッケージ %s はデータベースには存在しますが、利用できません。\n"
-"おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
-"あるいは別のソースからのみしか利用できないという状況が考えられます\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "しかし、以下のパッケージで置き換えられています:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "パッケージ %s にはインストール候補がありません"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s はすでに最新バージョンです。\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "ソースパッケージリスト %s の状態を取得できません"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連のものを削除するようになっていないので、AutoRemover を開始できません"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1044,7 +1070,7 @@ msgstr[0] ""
 msgstr[1] ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1054,11 +1080,11 @@ msgstr[0] ""
 msgstr[1] ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1076,45 +1102,25 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー、AutoRemover が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部エラー、AllUpgrade が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "タスク %s が見つかりません"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "パッケージ %s が見つかりません"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s は手動でインストールしたと設定されました。\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
 "ません:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1122,7 +1128,7 @@ msgstr ""
 "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
 "を明示してください)。"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1134,122 +1140,147 @@ msgstr ""
 "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
 "動されていないことが考えられます。"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "以下の特別パッケージがインストールされます:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "提案パッケージ:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "パッケージ %s が見つかりません"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s は手動でインストールしたと設定されました。\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "アップグレードパッケージを検出しています ... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "完了"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s のソースパッケージが見つかりません"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s に充分な空きスペースがありません"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s のビルド依存情報を取得できません"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1258,7 +1289,7 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1267,32 +1298,32 @@ msgstr ""
 "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
 "する %1$s の依存関係を満たすことができません"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
 "ケージは新しすぎます"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1317,6 +1348,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1381,7 +1414,7 @@ msgstr ""
 "apt.conf(5) を参照してください。\n"
 "                        この APT は Super Cow Powers 化されています。\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1628,9 +1661,9 @@ msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s を読み込むことができません"
@@ -1659,10 +1692,9 @@ msgstr "%sinfo の状態の取得に失敗しました"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "パッケージリストを読み込んでいます"
 
@@ -1797,12 +1829,12 @@ msgstr "ディスクが見つかりません。"
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "状態の取得に失敗しました"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "変更時刻の設定に失敗しました"
 
@@ -1864,7 +1896,7 @@ msgstr "接続タイムアウト"
 msgid "Server closed the connection"
 msgstr "サーバが接続を切断しました"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "読み込みエラー"
 
@@ -1876,199 +1908,180 @@ msgstr "レスポンスがバッファをオーバフローさせました。"
 msgid "Protocol corruption"
 msgstr "プロトコルが壊れています"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "書き込みエラー"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "ソケットを作成できません"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "パッシブソケットに接続できません。"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo はリスニングポートを取得することができませんでした"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "ソケットをバインドできませんでした"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "ソケットをリスンできませんでした"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "ソケットの名前を特定できませんでした"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "PORT コマンドを送信できません"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知のアドレスファミリ %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT に失敗しました。サーバ応答: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "データソケット接続タイムアウト"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ファイルを取得できません。サーバ応答 '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "データソケットタイムアウト"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "データ転送に失敗しました。サーバ応答 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "問い合わせ"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "呼び出せません"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) へ接続しています"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s) への接続を開始できません。"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s (%s) へ接続できませんでした。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s へ接続しています"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s' を解決できませんでした"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' が一時的に解決できません"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s へ接続できません:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "インストールを中断します。"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "少なくとも 1 つの不正な署名が発見されました。"
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて"
 "いますか?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "gpgv の実行中に未知のエラーが発生"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "以下の署名が無効です:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "%s に対してパイプを開けませんでした"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "%s プロセスからの読み込みエラー"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "ヘッダの待機中です"
@@ -2130,19 +2143,19 @@ msgstr "リモート側で接続がクローズされてサーバからの読み
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "ファイルの切り詰めに失敗しました"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "内部エラー"
 
@@ -2177,11 +2190,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2208,7 +2226,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "選択された %s が見つかりません"
@@ -2339,152 +2357,169 @@ msgstr "%s へ変更することができません"
 msgid "Failed to stat the cdrom"
 msgstr "cdrom の状態を取得するのに失敗しました"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "読み込み専用のロックファイル %s にロックは使用しません"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ロックファイル %s をオープンできません"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ロック %s が取得できませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s を待ちましたが、そこにはありませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子プロセス %s がエラーコード (%u) を返しました"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子プロセス %s が予期せず終了しました"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "ファイル %s をオープンできませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s に対してパイプを開けませんでした"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "読み込みが %lu 残っているはずですが、何も残っていません"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "ファイルのクローズ中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "ファイルのクローズ中に問題が発生しました"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "ファイルの同期中に問題が発生しました"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "ファイルの削除中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "ファイルの同期中に問題が発生しました"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "空のパッケージキャッシュ"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "パッケージキャッシュファイルが壊れています"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "依存"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "先行依存"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "提案"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "推奨"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "競合"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "置換"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "廃止"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "破壊"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "要求"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "任意"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "特別"
 
@@ -2514,7 +2549,7 @@ msgstr "状態ファイル %s のオープンに失敗しました"
 msgid "Failed to write temporary StateFile %s"
 msgstr "一時状態ファイル %s の書き込みに失敗しました"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2599,7 +2634,7 @@ msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2649,7 +2684,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2701,12 +2736,12 @@ msgstr ""
 "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ"
 "い。"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "パッケージングシステム '%s' はサポートされていません"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "適切なパッケージシステムタイプを特定できません"
 
@@ -2719,145 +2754,167 @@ msgstr "%s の状態を取得できません。"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list に 'ソース' URI を指定する必要があります"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "パッケージリストまたはステータスファイルを解釈またはオープンすることができま"
 "せん。"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
 "せん"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ"
 "ん"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "pin タイプ %s が理解できませんでした"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "pin で優先度 (または 0) が指定されていません"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "キャッシュに非互換なバージョニングシステムがあります"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "%s を処理中にエラーが発生しました (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "%s を処理中にエラーが発生しました (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "%s を処理中にエラーが発生しました (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "%s を処理中にエラーが発生しました (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "%s を処理中にエラーが発生しました (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "%s を処理中にエラーが発生しました (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "%s を処理中にエラーが発生しました (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "この APT が対応している以上の数のパッケージが指定されました。"
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "この APT が対応している以上の数のバージョンが要求されました。"
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "この APT が対応している以上の数の説明が要求されました。"
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "この APT が対応している以上の数の依存関係が発生しました。"
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "%s を処理中にエラーが発生しました (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ソースパッケージリスト %s の状態を取得できません"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "ファイル提供情報を収集しています"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "名前の変更に失敗しました。%s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum が適合しません"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "ハッシュサムが適合しません"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2866,7 +2923,7 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります (存在しないアーキテクチャのため)。"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2875,7 +2932,7 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります。"
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2883,25 +2940,35 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "サイズが適合しません"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "パッケージファイル %s を解釈することができません (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "注意、%2$s の代わりに %1$s を選択します\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "diversion ファイルに不正な行があります: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "パッケージファイル %s を解釈することができません (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2954,8 +3021,8 @@ msgstr "ディスクのインデックスファイルを走査しています ..
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック"
 "ス、%zu の署名を見つけました\n"
@@ -2996,147 +3063,186 @@ msgstr "新しいソースリストを書き込んでいます\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "このディスクのソースリストのエントリ:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i レコードを書き込みました。\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
 "ファイルがあります。\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "設定ファイル %s をオープンできませんでした"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "ハッシュサムが適合しません"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "%s をインストールしています"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s を設定しています"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削除しています"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s を完全に削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "インストール後トリガ %s を実行しています"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ディレクトリ '%s' が見つかりません"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "ファイル %s をオープンできませんでした"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s を展開しています"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s の設定を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s をインストールしました"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s の削除を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s を削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s を完全に削除する準備をしています"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
 "い?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "list ディレクトリをロックできません"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3154,10 +3260,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "途中で接続がクローズされました"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "タスク %s が見つかりません"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s に対してパイプを開けませんでした"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s プロセスからの読み込みエラー"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "%s を処理中にエラーが発生しました (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)"
 
diff --git a/po/km.po b/po/km.po
index 59a084f47..38507e856 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,158 +10,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រ័យ​មិន​ត្រូវ​គ្នា ៖\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  កញ្ចប់​ធម្មតា ៖ "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​សុទ្ធ ៖ "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​តែ​មួយ ៖ "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​លាយ ៖ "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  បាត់បង់ ៖ "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "ទំហំ slack សរុប ៖"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "រក​កញ្ចប់​មិន​ឃើញ"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "ឯកសារ​កញ្ចប់ ៖"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ឃ្លាំង​សម្ងាត់​ឋិតនៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទេ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(រក​មិន​ឃើញ)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  បាន​ដំឡើង ៖ "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  សាកល្បង ៖ "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(គ្មាន)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  ខ្ទាស់​កញ្ចប់ ៖ "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -183,6 +183,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -315,12 +316,12 @@ msgstr ""
 "  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "មិន​អាច​សរសេរ​ទៅ %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
 
@@ -656,79 +657,79 @@ msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់
 msgid "Failed to rename %s to %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " ឬ"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ដោយ​សារតែ​ %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -736,140 +737,233 @@ msgstr ""
 "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
 "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ​ត្រូវបានបន្ទាប់ "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [បានដំឡើង​]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "កំណែ​សាកល្បង​"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។"
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"មិន​មាន​កញ្ចប់​ %s ទេ ប៉ុន្តែ​វា​ត្រូវ​បាន​យោង​ទៅ​ដោយ​កញ្ចប់​ផ្សេង​ទៀត​ ។\n"
+"វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n"
+"អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " បាន​បរាជ័យ ។"
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " ធ្វើ​រួច"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសារ ។\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -880,28 +974,28 @@ msgstr ""
 "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "បោះបង់ ។"
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -909,126 +1003,57 @@ msgstr ""
 "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
 "fix- ដែលបាត់ឬ់ ?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [បានដំឡើង​]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "កំណែ​សាកល្បង​"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។"
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"មិន​មាន​កញ្ចប់​ %s ទេ ប៉ុន្តែ​វា​ត្រូវ​បាន​យោង​ទៅ​ដោយ​កញ្ចប់​ផ្សេង​ទៀត​ ។\n"
-"វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n"
-"អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1038,7 +1063,7 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1046,11 +1071,11 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1066,51 +1091,31 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1122,126 +1127,151 @@ msgstr ""
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
 " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "ធ្វើរួច​"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1250,30 +1280,30 @@ msgstr ""
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1298,6 +1328,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1356,7 +1388,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1602,9 +1634,9 @@ msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "មិន​អាច​អាន​ %s បានឡើយ"
@@ -1633,10 +1665,9 @@ msgstr "បរាជ័យ​ក្នុងការថ្លែង %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "ថតព័ត៌មាន​ និង ពុម្ព ត្រូវការនៅលើ​ប្រព័ន្ធឯកសារ​ដូចគ្នា​"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
 
@@ -1768,12 +1799,12 @@ msgstr "រក​ថាសមិ​ន​ឃើញ​ ។"
 msgid "File not found"
 msgstr "រកឯកសារ​មិន​ឃើញ​"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "បរាជ័យ​ក្នុងការថ្លែង"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
 
@@ -1834,7 +1865,7 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
 msgid "Server closed the connection"
 msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "ការអាន​មានកំហុស"
 
@@ -1846,196 +1877,178 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន
 msgid "Protocol corruption"
 msgstr "ការបង្ខូច​ពិធីការ​"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "ការសរសេរ​មានកំហុស"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើយ"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "មិនអាចតភ្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្តាប់​​បានឡើយ"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "មិន​អាច​កំណត់​ឈ្មោះរបស់​រន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន្នន័យ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "សំណួរ​"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "មិន​អាច​ហៅ​ "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP ៖ %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "មិន​អាច​បង្កើត​រន្ធ​សម្រាប់ %s (f=%u t=%u p=%u) បានឡើយ"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s:%s (%s) បានឡើយ ។"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "កំពុង​រង់ចាំ​បឋមកថា"
@@ -2097,20 +2110,20 @@ msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
@@ -2145,11 +2158,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2176,7 +2194,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
@@ -2307,152 +2325,169 @@ msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ"
 msgid "Failed to stat the cdrom"
 msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "អាស្រ័យ​"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "អាស្រ័យជា​មុន"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "ផ្ដល់យោបល់​"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "ផ្តល់​អនុសាសន៍​"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "ប៉ះទង្គិច"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "ជំនួស​"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "លែង​ប្រើ"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "សំខាន់​"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "បាន​ទាមទារ"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "គំរូ"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "ស្រេចចិត្ត"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "បន្ថែម"
 
@@ -2483,7 +2518,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2568,7 +2603,7 @@ msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2616,7 +2651,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2665,12 +2700,12 @@ msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចា
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
 
@@ -2683,141 +2718,163 @@ msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "កំហុស​បាន​កើត​ឡើង​​ ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កញ្ចប់​ថ្មី​)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើ​កញ្ចប់​១​)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់២)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "កំហុស​បានកើត​ឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ១ថ្មី​)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់​៣)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "កំហុស​បាន​កើត​ឡើង​ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កំណែ២​ថ្មី​)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​%s (ផ្តល់​ឯកសារ​ប្រមូល​ផ្តុំ)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2826,7 +2883,7 @@ msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
 "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2834,31 +2891,41 @@ msgid ""
 msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។"
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2912,8 +2979,8 @@ msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i  លិបិក្រម​ប្រភព%i  និង ហត្ថលេខា %i \n"
 
 #: apt-pkg/cdrom.cc:677
@@ -2952,143 +3019,182 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ
 msgid "Source list entries for this disc are:\n"
 msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "កំពុង​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "កំពុងរៀបចំ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "កំពុង​ស្រាយ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "បាន​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3106,10 +3212,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "កំហុស​បាន​កើត​ឡើង​ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កំណែ២​ថ្មី​)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)"
 
@@ -3161,8 +3289,8 @@ msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i  លិបិក្រម​ប្រភព%i  និង ហត្ថលេខា %i \n"
 
 #, fuzzy
diff --git a/po/ko.po b/po/ko.po
index 9ecdc6669..65169a356 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,155 +5,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-13 07:14+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "%s 패키지를 찾을 수 없습니다"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "전체 패키지 이름 : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "전체 패키지 이름 : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  일반 패키지: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  순수 가상 패키지: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  단일 가상 패키지: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  혼합 가상 패키지: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  빠짐: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "개별 버전 전체: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "개별 설명 전체: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "전체 의존성: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "전체 버전/파일 관계: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "전체 설명/파일 관계: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "전체 제공 매핑: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "전체 패턴 문자열: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "전체 의존성 버전 용량: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "전체 빈 용량: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "차지하는 전체 용량: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "정확히 한 개의 패턴을 넘겨야 합니다"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "패키지가 없습니다"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%s 패키지를 찾을 수 없습니다"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "패키지 파일:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "핀 패키지:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  설치: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  후보: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  패키지 핀: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  버전 테이블:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -174,6 +175,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -306,12 +308,12 @@ msgstr ""
 "  -c=? 설정 파일을 읽습니다\n"
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s에 쓸 수 없습니다"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
 
@@ -649,79 +651,79 @@ msgstr "%s의 링크를 해제하는 데 문제가 있습니다"
 msgid "Failed to rename %s to %s"
 msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "정규식 컴파일 오류 - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "다음 패키지의 의존성이 맞지 않습니다:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "하지만 %s 패키지를 설치했습니다"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "하지만 %s 패키지를 설치할 것입니다"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "하지만 설치할 수 없습니다"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "하지만 가상 패키지입니다"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "하지만 설치하지 않았습니다"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " 혹은"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "다음 새 패키지를 설치할 것입니다:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "다음 패키지를 지울 것입니다:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "다음 패키지를 과거 버전으로 유지합니다:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "다음 패키지를 업그레이드할 것입니다:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "다음 패키지를 다운그레이드할 것입니다:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s때문에) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -729,146 +731,241 @@ msgstr ""
 "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
 "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu개 업그레이드, %lu개 새로 설치, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu개 다시 설치, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu개 업그레이드, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "%s 패키지는 다음 패키지가 제공하는 가상 패키지입니다:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [설치함]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "후보 버전"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "설치할 패키지를 하나 분명히 지정해야 합니다."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"%s 패키지를 사용할 수 없습니다.  하지만 다른 패키지가 참조하고 있습니다.\n"
+"해당 패키지가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
+"패키지를 받아와야 하는 경우일 수도 있습니다.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "하지만 다음 패키지가 대체합니다:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "%s 패키지는 설치할 수 있는 후보가 없습니다"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 패키지는 이미 최신 버전입니다.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s 패키지 수동설치로 지정합니다.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "의존성을 바로잡는 중입니다..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " 실패."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "의존성을 바로잡을 수 없습니다"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "업그레이드 집합을 최소화할 수 없습니다"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " 완료"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "인증 경고를 무시합니다.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "확인하지 않고 패키지를 설치하시겠습니까 [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "인증할 수 없는 패키지가 있습니다"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
 "시오."
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%s바이트 아카이브를 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s 안에 충분한 여유 공간이 없습니다."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
 "아닙니다."
 
 # 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -879,28 +976,28 @@ msgstr ""
 "계속하시려면 다음 문구를 입력하십시오: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "중단."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "계속 하시겠습니까 [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s 파일을 받는 데 실패했습니다  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "일부 파일을 받는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -908,128 +1005,57 @@ msgstr ""
 "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
 "missing 옵션을 줘서 실행해야 할 것입니다."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "빠진 패키지를 바로잡을 수 없습니다."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "설치를 중단합니다."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s 패키지는 다음 패키지가 제공하는 가상 패키지입니다:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [설치함]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "후보 버전"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "설치할 패키지를 하나 분명히 지정해야 합니다."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"%s 패키지를 사용할 수 없습니다.  하지만 다른 패키지가 참조하고 있습니다.\n"
-"해당 패키지가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
-"패키지를 받아와야 하는 경우일 수도 있습니다.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "하지만 다음 패키지가 대체합니다:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "%s 패키지는 설치할 수 있는 후보가 없습니다"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 패키지는 이미 최신 버전입니다.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1041,7 +1067,7 @@ msgstr[0] ""
 msgstr[1] ""
 "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1051,11 +1077,11 @@ msgstr[0] ""
 msgstr[1] ""
 "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1073,44 +1099,24 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "%s 작업를 찾을 수 없습니다"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "%s 패키지를 찾을 수 없습니다"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s 패키지 수동설치로 지정합니다.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:"
 
 # FIXME: specify a solution?  무슨 솔루션?
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1118,7 +1124,7 @@ msgstr ""
 "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
 "(아니면 해결 방법을 지정하십시오)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1129,119 +1135,144 @@ msgstr ""
 "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
 "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "망가진 패키지"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "다음 패키지를 더 설치할 것입니다:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "제안하는 패키지:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "추천하는 패키지:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "%s 패키지를 찾을 수 없습니다"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s 패키지 수동설치로 지정합니다.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "업그레이드를 계산하는 중입니다... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "실패"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "완료"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "다운로드 디렉토리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s의 소스 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s에 충분한 공간이 없습니다"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는 데 실패했습니다."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1250,7 +1281,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1259,32 +1290,32 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
 "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너"
 "무 최근 버전입니다"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1309,6 +1340,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1368,7 +1401,7 @@ msgstr ""
 "apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 "                       이 APT는 Super Cow Powers로 무장했습니다.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1616,9 +1649,9 @@ msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s을(를) 읽을 수 없습니다"
@@ -1647,10 +1680,9 @@ msgstr "%sinfo의 정보를 읽는 데 실패했습니다"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "패키지 목록을 읽는 중입니다"
 
@@ -1782,12 +1814,12 @@ msgstr "디스크가 없습니다."
 msgid "File not found"
 msgstr "파일이 없습니다"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "파일 정보를 읽는 데 실패했습니다"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "파일 변경 시각을 설정하는 데 실패했습니다"
 
@@ -1849,7 +1881,7 @@ msgstr "연결 시간 초과"
 msgid "Server closed the connection"
 msgstr "서버에서 연결을 닫았습니다"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "읽기 오류"
 
@@ -1861,198 +1893,180 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다."
 msgid "Protocol corruption"
 msgstr "프로토콜이 틀렸습니다"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "쓰기 오류"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "소켓을 만들 수 없습니다"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "수동(passive) 소켓을 연결할 수 없습니다."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "소켓을 bind할 수 없습니다"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "소켓의 이름을 알아낼 수 없습니다"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "PORT 명령을 보낼 수 없습니다"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "데이터 소켓 연결 시간 초과"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "데이터 소켓에 제한 시간이 초과했습니다"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "데이터 전송 실패, 서버에서는: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "질의"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "다음을 실행할 수 없습니다: "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s(%s)에 연결하는 중입니다"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s에 연결할 수 없습니다 (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s에 연결하는 중입니다"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s'의 주소를 알아낼 수 없습니다"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s에 연결할 수 없습니다:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "설치를 중단합니다."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습"
 "니까?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "다음 서명이 올바르지 않습니다:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "%s에 대한 파이프를 열 수 없습니다"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "헤더를 기다리는 중입니다"
@@ -2114,19 +2128,19 @@ msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
 msgid "Error reading from server"
 msgstr "서버에서 읽는 데 오류가 발생했습니다"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "파일을 자르는 데 실패했습니다"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "내부 오류"
 
@@ -2161,11 +2175,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2192,7 +2211,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "선택한 %s이(가) 없습니다"
@@ -2323,152 +2342,169 @@ msgstr "%s 디렉토리로 이동할 수 없습니다"
 msgid "Failed to stat the cdrom"
 msgstr "CD-ROM의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "잠금 파일 %s 파일을 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s 잠금 파일을 얻을 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s 파일을 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s에 대한 파이프를 열 수 없습니다"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "파일을 닫는 데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "파일을 닫는 데 문제가 있습니다"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "파일을 동기화하는 데 문제가 있습니다"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "파일을 지우는 데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "파일을 동기화하는 데 문제가 있습니다"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "패키지 캐시가 비어 있습니다"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "패키지 캐시 파일이 손상되었습니다"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "패키지 캐시가 다른 아키텍쳐용입니다."
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "의존"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "미리의존"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "제안"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "추천"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "충돌"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "대체"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "없앰"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "망가뜨림"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "중요"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "필수"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "표준"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "옵션"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "별도"
 
@@ -2498,7 +2534,7 @@ msgstr "상태파일 %s 여는 데 실패했습니다"
 msgid "Failed to write temporary StateFile %s"
 msgstr "임시 상태파일 %s 쓰는 데 실패했습니다"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2583,7 +2619,7 @@ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2632,7 +2668,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2683,12 +2719,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
 
@@ -2701,139 +2737,161 @@ msgstr "%s의 정보를 읽을 수 없습니다."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 패키지 헤더가 없습니다"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "캐시의 버전 시스템이 호환되지 않습니다"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "파일에서 제공하는 것을 모으는 중입니다"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum이 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "해쉬 합계가 서로 다릅니다"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "다음 키 ID의 공개키가 없습니다:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2842,7 +2900,7 @@ msgstr ""
 "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
 "니다. (아키텍쳐가 빠졌기 때문입니다)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2851,32 +2909,42 @@ msgstr ""
 "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
 "니다."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "크기가 맞지 않습니다"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "전환 파일에 잘못된 줄이 있습니다: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2929,8 +2997,8 @@ msgstr "디스크에서 색인 파일을 찾는 중입니다...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n"
 
 #: apt-pkg/cdrom.cc:677
@@ -2969,144 +3037,183 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "레코드 %i개를 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "설정 파일 %s 파일을 여는 중입니다"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "해쉬 합계가 서로 다릅니다"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "%s 설치하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s 설정 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s 패키지를 지우는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "설치 후 트리거 %s 실행하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "디렉토리 '%s' 없습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s 파일을 열 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s 준비 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s 푸는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s 패키지를 설정할 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s 설치"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s 패키지를 지울 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s 지움"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "목록 디렉토리를 잠글 수 없습니다"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3124,10 +3231,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "연결이 너무 빨리 끊어졌습니다"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "%s 작업를 찾을 수 없습니다"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s에 대한 파이프를 열 수 없습니다"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)"
 
diff --git a/po/ku.po b/po/ku.po
index 952c9723e..2c0a4313f 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,159 +8,159 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KAider 0.1\n"
 "Plural-Forms: nplurals=2; plural= n != 1;\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Pakêt nehate dîtin %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Pakêtên normal:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Pakêtên farazî yên safî:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pakêta tenê ya farazî:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Pakêtên hevbeş yên farazî:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Winda: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Bindestên giştî:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Cihê giştî yê sist:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Cihê giştî yê veqetandî: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakêta dosya %s li derveyî demê ye."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Pêwist e tu mînakekê bidî"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Pakêt nayên dîtin"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Pelgehên Pakêt:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nehate dîtin)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Sazkirî: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Berendam: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ne tiştek)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Destika pakêtê:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -181,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -268,12 +269,12 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
 
@@ -567,218 +568,308 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "E"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "lê %s sazkirî ye"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "lê sazkirina wê ne gengaz e"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "lê paketeke farazî ye"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "lê ne sazkirî ye"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "lê dê neyê sazkirin"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " û"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Ev pakêt dê werine RAKIRIN:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Ev paket dê werine bilindkirin:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ji ber %s)"
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ji nû ve sazkirî,"
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu hatine nizmkirin."
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:640
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:647
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Sazkirî]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Guhartoyên berendam"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr ""
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr ""
+
+#: cmdline/apt-get.cc:712
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:788
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s jixwe guhertoya nûtirîn e.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "lê %s dê were sazkirin"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Bindestî tên serrastkirin..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " neserketî."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Nikare bindestiyan rast kirin"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Temam"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Anîna %sB ji arşîvan pêwist e.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarî cihê vala li %s tesbît bike"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Cihê vala li %s têre nake."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Erê, wusa bike!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -786,150 +877,84 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Betal."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Dixwazî bidomînî [E/n]?"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Anîna %s %s biserneket\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Daxistina çend pelan biserneket"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Sazkirin tê betalkirin."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1117
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Sazkirî]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Guhartoyên berendam"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s jixwe guhertoya nûtirîn e.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -939,7 +964,7 @@ msgid_plural ""
 msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
 msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -947,11 +972,11 @@ msgid_plural ""
 msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
 msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -967,49 +992,29 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Peywira %s nehate dîtin"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Nikarî pakêta %s bibîne"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "lê %s dê were sazkirin"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1017,156 +1022,181 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Paketên şikestî"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Paketên tên pêşniyaz kirin:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Paketên tên tawsiyê kirin:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nikarî pakêta %s bibîne"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "lê %s dê were sazkirin"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Bilindkirin tê hesibandin..."
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Serneket"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Temam"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Cihê vala li %s têre nake"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Çavkanîna %s bîne\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1190,6 +1220,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1210,7 +1242,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1444,9 +1476,9 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwîne"
@@ -1475,10 +1507,9 @@ msgstr "%s venebû"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Lîsteya pakêtan tê xwendin"
 
@@ -1606,13 +1637,13 @@ msgstr "Dîsk nehate dîtin."
 msgid "File not found"
 msgstr "Pel nehate dîtin"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 #, fuzzy
 msgid "Failed to stat"
 msgstr "%s venebû"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1672,7 +1703,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Çewiya xwendinê"
 
@@ -1684,198 +1715,179 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Çewtiya nivîsînê"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, fuzzy, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Danegira %s nehate vekirin: %s"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Lêpirsîn"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 #, fuzzy
 msgid "Unable to invoke "
 msgstr "%s venebû"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Girêdan bi %s (%s) re pêk tê"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Bi %s re tê girêdan"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nikarî '%s' çareser bike"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nikare bi %s re girêdan pêk bîne %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Sazkirin tê betalkirin."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de çewtiya nenas"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr ""
@@ -1938,20 +1950,20 @@ msgstr ""
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Nivîsîna pelê %s biserneket"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
@@ -1986,11 +1998,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2017,7 +2034,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Hilbijartina %s nehatiye dîtin"
@@ -2148,152 +2165,169 @@ msgstr "Nikarî derbasa %s bike"
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nikarî qufila pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nikarî pelê %s veke"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Di girtina pelî de pirsgirêkek derket"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
-msgstr ""
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Di girtina pelî de pirsgirêkek derket"
+
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Bindest"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "PêşBindest"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Pêşniyaz dike"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Tawsiye dike"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Nakokî"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Dikeve şunve"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Kevin dike"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Dişkîne"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "girîng"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "pêwist"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opsiyonel"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "ekstra"
 
@@ -2323,7 +2357,7 @@ msgstr "Vekirina StateFile %s biserneket"
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s ji hev nehate veçirandin"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2408,7 +2442,7 @@ msgstr ""
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2451,7 +2485,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2499,12 +2533,12 @@ msgstr ""
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2517,177 +2551,209 @@ msgstr "Nivîsandin ji bo %s ne pêkane"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
 #, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nav guherandin biserneket, %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum li hev nayên"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum li hev nayên"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Mezinahî li hev nayên"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2738,8 +2804,8 @@ msgstr ""
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:677
@@ -2778,143 +2844,182 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i tomar hatin nivîsîn.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum li hev nayên"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s tê mîhengkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s tê rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s tê derxistin"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Mîhengkirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Bi tevahî rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -2932,10 +3037,13 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Girêdan zû hatiye girtin"
 
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Peywira %s nehate dîtin"
+
 #, fuzzy
 #~ msgid "Could not patch file"
 #~ msgstr "Danegira %s nehate vekirin: %s"
diff --git a/po/lt.po b/po/lt.po
index 6033df080..e9ae45994 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,158 +8,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nepavyko rasti paketo %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 #, fuzzy
 msgid "Total package names: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normalūs paketai: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pavieniai virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Mišrūs virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Trūksta: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Viso skirtingų versijų: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Viso skirtingų aprašymų: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Viso priklausomybių: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Viso versijų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Viso aprašymų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Paketų nerasta"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nepavyko rasti paketo %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Paketų failai:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Surišti paketai:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nerasta)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Įdiegta: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidatas: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(nėra)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Paketo susiejimai: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -180,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -277,12 +277,12 @@ msgstr ""
 "  -c=? Nuskaityti šį konfigūracijų failą\n"
 "  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nepavyko įrašyti į %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
 
@@ -623,79 +623,79 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr "Nepavyko pervadinti %s į %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "T"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Šie paketai turi neįdiegtų priklausomybių:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "bet %s yra įdiegtas"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "bet %s bus įdiegtas"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "tačiau jis negali būti įdiegtas"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "bet tai yra virtualus paketas"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "bet jis nėra įdiegtas"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "bet jis nebus įdiegtas"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " arba"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Bus įdiegti šie NAUJI paketai:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Bus PAÅ ALINTI Å¡ie paketai:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Šių paketų atnaujinimas sulaikomas:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Bus atnaujinti Å¡ie paketai:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Bus PAKEISTI SENESNIAIS Å¡ie paketai:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Bus pakeisti Å¡ie sulaikyti paketai:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dėl %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -703,141 +703,236 @@ msgstr ""
 "Įspėjimas: Šie būtini paketai bus pašalinti.\n"
 "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu atnaujinti, %lu naujai įdiegti, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu įdiegti iš naujo, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu pasendinti, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Paketas %s yra virtualus, pateiktas:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Įdiegtas]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Galimos versijos"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Reikia pažymėti įdiegimui bent vieną."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Paketo %s nėra, bet jis nurodytas prie kito paketo.\n"
+"Tai gali reikšti, kad paketas dingęs, nebenaudojamas \n"
+"arba prieinamas tik iš kitų šaltinių.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Tačiau šie paketai jį pakeičia:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Paketas %s neturi diegimo kandidatų"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ir taip jau yra naujausias.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Taisomos priklausomybės..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " nepavyko."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Nepavyko patenkinti priklausomybių"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 #, fuzzy
 msgid "Unable to minimize the upgrade set"
 msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Įvykdyta"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Įdiegti šiuos paketus be patvirtinimo [t/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Nepavyko autentikuoti kai kurių paketų"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Nepavyko perskaityti šaltinių sąrašo."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Keista.. Dydis neatitinka, Parašykite laišką apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Reikia parsiųsti %sB/%sB archyvų.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Reikia parsiųsti %sB archyvų.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po Å¡ios operacijos bus naudojama %sB papildomos disko vietos.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po Å¡ios operacijos bus atlaisvinta %sB disko vietos.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nepavyko nustatyti %s laisvos vietos"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s nėra pakankamai laisvos vietos."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Taip, daryk kaip liepiu!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -848,28 +943,28 @@ msgstr ""
 "Jei norite tęsti, įveskite frazę „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Nutraukti."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ar norite tęsti [T/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nepavyko parsiųsti %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Nepavyko parsiųsti kai kurių failų"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Pavyko parsiųsti tik parsiuntimo režime"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -877,128 +972,57 @@ msgstr ""
 "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
 "arba pabandykite su parametru --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Nepavyko pataisyti dingusių paketų."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Diegimas nutraukiamas."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Paketas %s yra virtualus, pateiktas:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Įdiegtas]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Galimos versijos"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Reikia pažymėti įdiegimui bent vieną."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Paketo %s nėra, bet jis nurodytas prie kito paketo.\n"
-"Tai gali reikšti, kad paketas dingęs, nebenaudojamas \n"
-"arba prieinamas tik iš kitų šaltinių.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Tačiau šie paketai jį pakeičia:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Paketas %s neturi diegimo kandidatų"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ir taip jau yra naujausias.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Pažymėta versija %s (%s) paketui %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Atnaujinimo komandai argumentų nereikia"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1008,7 +1032,7 @@ msgid_plural ""
 msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1016,11 +1040,11 @@ msgid_plural ""
 msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1036,43 +1060,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Nepavyko rasti užduoties %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Nepavyko rasti paketo %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1080,7 +1084,7 @@ msgstr ""
 "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
 "nurodytų paketų (arba nurodykite išeitį)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1092,119 +1096,144 @@ msgstr ""
 "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
 "pašalinti iš \"Incoming\" aplanko."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Bus įdiegti šie papildomi paketai:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Siūlomi paketai:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Rekomenduojami paketai:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nepavyko rasti paketo %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Skaičiuojami atnaujinimai... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Įvykdyta"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Nepavyko užrakinti parsiuntimų aplanko"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Neturite pakankamai laisvos vietos %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Parsiunčiamas archyvas %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Nepavyko gauti kai kurių arhcyvų."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Klaida procese-palikuonyje"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1212,7 +1241,7 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1221,32 +1250,32 @@ msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
 "versijos %s paketo"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
 "per naujas"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1270,6 +1299,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1290,7 +1321,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1541,9 +1572,9 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
@@ -1572,10 +1603,9 @@ msgstr ""
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Skaitomi paketų sąrašai"
 
@@ -1703,12 +1733,12 @@ msgstr "Diskas nerastas."
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1768,7 +1798,7 @@ msgstr "Jungiamasi per ilgai"
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Skaitymo klaida"
 
@@ -1780,196 +1810,177 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Rašymo klaida"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Užklausti"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai užtruko"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nepavyko prisijungti prie %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Jungiamasi prie %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nepavyko surasti vardo „%s“"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Laikinas sutrikimas ieškant vardo „%s“"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nepavyko prisijungti prie %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Diegimas nutraukiamas."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Nežinoma klaida kviečiant gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Šie parašai buvo nevalidūs:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Laukiama antraščių"
@@ -2031,20 +2042,20 @@ msgstr ""
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Nepavyko patikrinti %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
@@ -2079,11 +2090,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2110,7 +2126,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -2241,152 +2257,169 @@ msgstr "Nepavyko pakeisti į %s"
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nepavyko atverti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nepavyko rezervuoti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Procesas %s grąžino klaidos kodą (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Procesas %s netikėtai išėjo"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nepavyko atverti failo %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
-msgstr ""
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Klaida užveriant failą"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Klaida sinchronizuojant failą"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Klaida užveriant failą"
+
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Klaida sinchronizuojant failą"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Priklauso"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Priešpriklauso"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Siūlo"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Rekomenduoja"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Konfliktuoja"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Sugadina"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "Svarbu"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "privaloma"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standartinis"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "nebūtinas"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "papildomas"
 
@@ -2416,7 +2449,7 @@ msgstr ""
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2501,7 +2534,7 @@ msgstr ""
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2544,7 +2577,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2594,12 +2627,12 @@ msgstr ""
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2612,179 +2645,211 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Nepavyko perskaityti arba atverti paketų sąrašo arba būklės failo."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų "
 "ištaisytos"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
 #, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5 sumos neatitikimas"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG klaida: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Neatitinka dydžiai"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2835,8 +2900,8 @@ msgstr ""
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:677
@@ -2875,143 +2940,182 @@ msgstr "Rašomas naujas šaltinių sąrašas\n"
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigūruojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Å alinamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Ruošiamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "IÅ¡pakuojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Ruošiamasi konfigūruoti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Ruošiamasi %s pašalinimui"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Ruošiamasi visiškai pašalinti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nepavyko užrakinti sąrašo aplanko"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3029,10 +3133,19 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr ""
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Nepavyko rasti užduoties %s"
+
 #, fuzzy
 #~| msgid "Could not open file %s"
 #~ msgid "Could not patch file"
@@ -3060,9 +3173,6 @@ msgstr ""
 #~ msgid "Line %d too long (max %u)"
 #~ msgstr "Eilutė %d per ilga (leidžiama %u simbolių)"
 
-#~ msgid "GPG error: %s: %s"
-#~ msgstr "GPG klaida: %s: %s"
-
 #~ msgid "Apt Authentication issue"
 #~ msgstr "Apt autentikacijos problema"
 
diff --git a/po/mr.po b/po/mr.po
index b470fa6d6..394e43cad 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,156 +6,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
 "<janabhaaratii@cdacmumbai.in>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "पॅकेज %s आवृती %s मध्ये एक अनोळखी डीईपी:आहे\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr " सामान्य पॅकेजेस्: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr " शुध्द आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr " एकमेव आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "मिश्रित आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr " हरवलेले/गहाळ: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "एकूण स्पष्ट आवृत्या: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "एकूण स्पष्ट विवरणे: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "एकूण निर्भरता:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "एकूण विव/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "एकूण मॅपींगस् तरतूद: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "एकूण एकत्रित अक्षरसंच:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "एकूण परावलंबित आवृत्ती अवकाश:"
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "एकूण दुर्लक्षित अवकाश:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "पॅकेजेस सापडले नाहीत"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "पॅकेज संचिका:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "एकत्रित पॅकेजेस:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(मिळाले नाही)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "अधिष्ठापित केले:"
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "उमेदवार:"
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(कोणताच नाही)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "पॅकेज (पिन):"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "आवृत्ती कोष्टक:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -176,6 +177,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -308,12 +310,12 @@ msgstr ""
 "  -c=?  ही संरचना संचिका वाचा \n"
 " -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s मध्ये लिहिण्यास असमर्थ "
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
 
@@ -649,79 +651,79 @@ msgstr "%s दुवा मोकळा/सुटा करण्यास अ
 msgid "Failed to rename %s to %s"
 msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "होय"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "पण %s संस्थापित झाले"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "पण %s संस्थापित करायचे आहे"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "पण ते संस्थापित करण्याजोगे नाही"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "पण ते आभासी पॅकेज आहे"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "पण ते संस्थापित केले नाही"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "पण ते संस्थापित होणार नाही"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr "किंवा"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "खालील पॅकेजेस परत ठेवली गेली:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (च्या मुळे %s)"
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -729,140 +731,233 @@ msgstr ""
 "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
 "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu पुनर्संस्थापित केले,"
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu मागील आवृत्तीकृत केले,"
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "%s हे आभासी पॅकेज ह्यांच्याकडून तरतूद केले आहे,:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr "[संस्थापित केले]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "कंॅडिडेट आवृत्त्या"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "तुम्ही संस्थापित करण्यासाठी एक निश्चित स्पष्टपणे निवडले पाहिजे."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"%s पॅकेज उपलब्ध नाही, पण दुसऱ्या पॅकेजच्या संदर्भाने.\n"
+"याचा अर्थ असाही आहे की पॅकेज सापडत नाही,ते कालबाह्य किंवा \n"
+" म्हणजे ते दुसऱ्या उगमातून उपलब्ध\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr "अयशस्वी/चूकीचे झाले."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr "झाले"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "अर्काईव्हजच्या %sB/%sB घेण्याची गरज आहे\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "अर्काईव्हज%sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "या क्रियेनंतर, %sB एवढी अधिक डिस्क जागा वापरली जाईल.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "हो, मी म्ह्टल्याप्रमाणे करा!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -873,28 +968,28 @@ msgstr ""
 "पुढे '%s' उक्ती मध्ये लिहिणार \n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "व्यत्यय/बंद करा."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s आणणे असफल\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -902,127 +997,58 @@ msgstr ""
 "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- "
 "बरोबर प्रयत्न कराहरवलेले/गहाळ?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "संस्थापन खंडित करत आहे."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s हे आभासी पॅकेज ह्यांच्याकडून तरतूद केले आहे,:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr "[संस्थापित केले]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "कंॅडिडेट आवृत्त्या"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "तुम्ही संस्थापित करण्यासाठी एक निश्चित स्पष्टपणे निवडले पाहिजे."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"%s पॅकेज उपलब्ध नाही, पण दुसऱ्या पॅकेजच्या संदर्भाने.\n"
-"याचा अर्थ असाही आहे की पॅकेज सापडत नाही,ते कालबाह्य किंवा \n"
-" म्हणजे ते दुसऱ्या उगमातून उपलब्ध\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1032,7 +1058,7 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1040,11 +1066,11 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1062,45 +1088,25 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "%s कार्य सापडू शकले नाही"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "%s पॅकेज सापडू शकले नाही"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
 "लागेल'यात बदल करण्यासाठी:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1108,7 +1114,7 @@ msgstr ""
 "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
 "(किंवा पर्याय सांगा)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1120,126 +1126,151 @@ msgstr ""
 "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
 "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "तुटलेली पॅकेजेस"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "सुचवलेली पॅकेजेस:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "शिफारस केलेली पॅकेजेस:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "%s पॅकेज सापडू शकले नाही"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "असमर्थ"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "झाले"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s मध्ये पुरेशी जागा नाही"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s उगम घ्या\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "चाईल्ड प्रक्रिया अयशस्वी"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1248,30 +1279,30 @@ msgstr ""
 "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
 "डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1296,6 +1327,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1356,7 +1389,7 @@ msgstr ""
 " apt.conf(5)  पुस्तिका पाने पहा.\n"
 "         ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1604,9 +1637,9 @@ msgstr "File %s/%s, %s पॅकेज मधल्या एका वर प
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s वाचण्यास असमर्थ"
@@ -1635,10 +1668,9 @@ msgstr "% sinfo स्टॅट करण्यास असमर्थ"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "पॅकेज याद्या वाचत आहोत"
 
@@ -1770,12 +1802,12 @@ msgstr "डिस्क सापडत नाही"
 msgid "File not found"
 msgstr "फाईल सापडली नाही"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "स्टॅट करण्यास असमर्थ"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
 
@@ -1837,7 +1869,7 @@ msgstr "वेळेअभावी संबंध जोडता येत 
 msgid "Server closed the connection"
 msgstr "सर्व्हरने संबंध जोडणी बंद केली"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "त्रुटी वाचा"
 
@@ -1849,198 +1881,179 @@ msgstr "प्रतिसाधाने बफर भरुन गेले."
 msgid "Protocol corruption"
 msgstr "प्रोटोकॉल खराब झाले"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "लिहिण्यात त्रुटी"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "सॉकेट तयार करू शकत नाही"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "पॅसिव्ह सॉकेट जोडता येत नाही"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "सॉकेट चिकटवता येत नाही"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "सॉकेट वर ऐकता येत नाही"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "सॉकेटचे नाव सांगता येत नाही"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा  पाठविण्यास असमर्थ"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "डेटा सॉकेट वेळेअभावी तुटले"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "प्रश्न"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "जारी करण्यास करण्यास असमर्थ"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) ला जोडत आहे"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[आयपी:%s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) साठी सॉकेट तयार करू शकत नाही"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s (%s) ला जोडू शकत नाही"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s ला जोडत आहे"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "%s रिझॉल्व्ह होऊ शकत नाही "
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s ला जोडण्यास असमर्थ:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "संस्थापन खंडित करत आहे."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "खालील सह्या अवैध आहेत:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "%s साठी पाईप उघडता येत नाही"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "%s क्रियेपासून चूक वाचा"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "शीर्षकासाठी थांबले आहे...."
@@ -2102,19 +2115,19 @@ msgstr "सर्व्हर मधून वाचण्यात चूक. 
 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "फाईल छोटी करणे असफल"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
@@ -2149,11 +2162,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2180,7 +2198,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s निवडक भाग सापडत नाही"
@@ -2311,152 +2329,169 @@ msgstr "%s मध्ये बदलण्यास असमर्थ"
 msgid "Failed to stat the cdrom"
 msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s कुलूप फाईल उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s कुलुप मिळवता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s साठी पाईप उघडता येत नाही"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "फाईल बंद करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "फाईल बंद करण्यात अडचण"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "संचिकेची syncing समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "फाईल अनलिंकिंग करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "संचिकेची syncing समस्या"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "पॅकेज अस्थाई स्मृतिकोष"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "अवलंबित"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "पूर्व अवलंबित"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "सुचवणे"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "शिफारस"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "परस्परविरोध"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "परत त्याठिकाणी आणा"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "अप्रचलित"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "तोडले"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "अत्यावश्यक"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "एच्छिक"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "अधिक"
 
@@ -2486,7 +2521,7 @@ msgstr "%s StateFile उघडणे असफल"
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2571,7 +2606,7 @@ msgstr "स्त्रोत सुची %s (प्रकार) मध्य
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2620,7 +2655,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2670,12 +2705,12 @@ msgstr "%s कार्यपध्दती योग्य रीतीने
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
 
@@ -2688,144 +2723,166 @@ msgstr "%s स्टॅट करण्यात असमर्थ. "
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी  apt-get update प्रोग्राम चालू करु शकता"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "%s पिनचा प्रकार समजलेला नाही"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "%s (नविन पॅकेज) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "%s (वापरातील पॅकेज१) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "%s (NewFileDesc1) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "%s प्रक्रिया करीत असतांना दोष आढळून आला(वापरातील पॅकेज२)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "%s (नविन आवृत्ती १) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "%s(वापरातील पॅकेज३) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "%s(नविन आवृती२) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "%s (NewFileDesc2) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
 "आहे."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
 "ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "%s (तरतूद/पुरवलेल्या संचिका जमा) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2834,7 +2891,7 @@ msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
 "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2843,7 +2900,7 @@ msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते "
 "स्थिर/निश्चित करण्याची गरज आहे."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2851,25 +2908,35 @@ msgstr ""
 "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
 "ठिकाण %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "आकार जुळतनाही"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2922,8 +2989,8 @@ msgstr "संचिकाच्या यादी/सूचीसाठी ड
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "%zu पॅकेजेसची यादी/सूची, %zu स्त्रोताची यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu "
 "स्वाक्षऱ्या/सिगनेचर्स सापडल्या\n"
@@ -2964,143 +3031,182 @@ msgstr "नविन स्त्रोत सूची लिहित आह
 msgid "Source list entries for this disc are:\n"
 msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i माहितीसंच लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "%s संरचना फाईल उघडत आहे"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "%s संस्थापित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s संरचित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s काढून टाकत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' संचयिका गहाळ आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s तयार करित आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s सुटे/मोकळे करीत आहे "
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s संरचने साठी तयार करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s संस्थापित झाले"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3118,10 +3224,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "जोडणी अकाली बंद झाली"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "%s कार्य सापडू शकले नाही"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s साठी पाईप उघडता येत नाही"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s क्रियेपासून चूक वाचा"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "%s(नविन आवृती२) प्रक्रिया करीत असतांना दोष आढळून आला"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "स्त्रोत सुची %s (विक्रेता आयडी) मध्ये %u वाईट/व्यंग रेषा "
 
@@ -3174,8 +3302,8 @@ msgstr "जोडणी अकाली बंद झाली"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "%i पॅकेजेसची यादी/सूची , %i स्त्रोताची यादी/सूची आणि %i स्वाक्षऱ्या/सिगनेचर्स "
 #~ "सापडल्या \n"
diff --git a/po/nb.po b/po/nb.po
index 06ca38b2d..96f66a8b5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,157 +13,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-02-01 18:26+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Klarer ikke å finne pakken %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Plassmengde pakkenavn: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Plassmengde pakkenavn: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Vanlige pakker: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Sammensatte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Mangler: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Antall unike versjoner: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Antall unike beskrivelser: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Antall avhengighetsforhold: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Antall forhold versjon/fil: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Antall forhold beskrivelse/fil: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Antall tilbudte tilknyttinger: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Antall utvidede strenger: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Total plass for avhengighetsforhold/versjoner: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Plass brukt av slark: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Samlet mengde redegjort plass: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ikke oppdatert."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Du må oppgi nøyaktig ett mønster"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Fant ingen pakker"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Klarer ikke å finne pakken %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Låste pakker:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pakke låst til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompilert på %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -184,6 +185,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -318,12 +320,12 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan ikke skrive til %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
 
@@ -405,7 +407,8 @@ msgstr ""
 "erstatninger for dpkg-scanpackages og dpkg-scansources.\n"
 "\n"
 "apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n"
-"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg til\n"
+"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg "
+"til\n"
 "MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n"
 "gjennom verdier for prioritet og kategori.\n"
 "\n"
@@ -659,79 +662,79 @@ msgstr "Problem ved oppheving av lenken til %s"
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikke å endre navnet på %s til %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installeres"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "men lar seg ikke installere"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "men er en virtuell pakke"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "men er ikke installert"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "men skal ikke installeres"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil bli installert:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil bli FJERNET:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er holdt tilbake:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil bli oppgradert:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil bli NEDGRADERT:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Følgende pakker vil bli endret:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (pga. %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -739,143 +742,238 @@ msgstr ""
 "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
 "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nylig installerte, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert på nytt, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Utvalgt versjon %s (%s) for %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installert]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versjons-kandidater"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Du må velge en pakke som skal installeres."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Pakken %s er ikke tilgjengelig, men en annen pakke henviser til den.\n"
+"Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
+"tilgjengelig fra en annen kilde.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Følgende pakker erstatter den imidlertid:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakken %s har ingen installasjonskandidat"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Merk, velger %s istedenfor %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s er allerede nyeste versjon.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s satt til manuell installasjon.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Retter på avhengighetsforhold ..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " mislyktes."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Klarer ikke å rette på avhengighetsforholdene"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarer ikke å minimere oppgraderingsettet"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Utført"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsadvarsel overstyrt.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installer disse pakkene uten verifikasjon [j/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Noen pakker ble ikke autentisert"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil, sortering fullførte ikke"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
 "apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Må hente %sB/%sB med arkiver.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Må hente %sB med arkiver.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Dessverre, ikke nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ja, gjør som jeg sier!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -886,157 +984,86 @@ msgstr ""
 "For å fortsette skriv inn teksten «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Avbryter."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsette [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Noen av filene kunne ikke lastes ned"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller «--"
-"fix-missing»."
+"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
+"«--fix-missing»."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "«--fix-missing» og bytte av media støttes nå ikke"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Klarer ikke å rette på manglende pakker."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Avbryter istallasjonen."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Merk, velger %s istedenfor %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Installert]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versjons-kandidater"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Du må velge en pakke som skal installeres."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Pakken %s er ikke tilgjengelig, men en annen pakke henviser til den.\n"
-"Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
-"tilgjengelig fra en annen kilde.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Følgende pakker erstatter den imidlertid:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Pakken %s har ingen installasjonskandidat"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s er allerede nyeste versjon.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Utgave «%s» av «%s» ble ikke funnet"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versjon «%s» av «%s» ble ikke funnet"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Utvalgt versjon %s (%s) for %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1048,7 +1075,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1058,11 +1085,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Bruk «apt-get autoremove» for å fjerne dem."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1080,43 +1107,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - «AllUpgrade» ødela noe"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Klarte ikke å finne oppgave %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Klarte ikke å finne pakken %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s satt til manuell installasjon.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1124,7 +1131,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
 "angi en løsning)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1136,126 +1143,151 @@ msgstr ""
 "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
 "distribusjonen."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Følgende ekstra pakker vil bli installert."
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Foreslåtte pakker:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Klarte ikke å finne pakken %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s satt til manuell installasjon.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Utført"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemløser ødela noe"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må angi minst en pakke du vil ha kildekoden til"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1264,32 +1296,32 @@ msgstr ""
 "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
 "versjoner av pakken %s som oppfyller versjonskravene"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %"
-"s er for ny"
+"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
+"%s er for ny"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1314,6 +1346,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1374,7 +1408,7 @@ msgstr ""
 "for mer informasjon og flere innstillinger\n"
 "                       Denne APT har kraften til en Superku.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1623,9 +1657,9 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke å lese %s"
@@ -1655,10 +1689,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Infokatalogen og den midlertidige katalogen må være på det samme filsystemet"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Leser pakkelister"
 
@@ -1773,8 +1806,8 @@ msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"Bruk «apt-cdrom» for å gjøre denne CD-plata tilgjengelig for APT. Du kan ikke "
-"bruke «apt-get update» til å legge til nye CD-plater."
+"Bruk «apt-cdrom» for å gjøre denne CD-plata tilgjengelig for APT. Du kan "
+"ikke bruke «apt-get update» til å legge til nye CD-plater."
 
 #: methods/cdrom.cc:218
 msgid "Wrong CD-ROM"
@@ -1795,12 +1828,12 @@ msgstr "Disk ikke funnet."
 msgid "File not found"
 msgstr "Fant ikke fila"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Klarte ikke å få status"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 
@@ -1862,7 +1895,7 @@ msgstr "Tidsavbrudd p
 msgid "Server closed the connection"
 msgstr "Tjeneren lukket forbindelsen"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1874,182 +1907,174 @@ msgstr "Et svar oversv
 msgid "Protocol corruption"
 msgstr "Protokollødeleggelse"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Klarte ikke å opprette en sokkel"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Klarte ikke å koble til en passiv sokkel."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Klarte ikke å binde til sokkel"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Klarte ikke å lytte til sokkel"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikke å avgjøre sokkelnavnet"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Klarte ikke å sende PORT-kommandoen"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjent adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikke å hente fila, tjeneren sa «%s»"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Tidsavbrudd på datasokkelen"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Spørring"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Klarte ikke å starte"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikke å koble til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kobler til %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikke å slå opp «%s»"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig feil ved oppslag av «%s»"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikke å koble til %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Avbryter istallasjonen."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Klarte ikke kjøre «%s» for å verifisere signaturen (er gpgv installert?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Ukjent feil ved kjøring av gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "De følgende signaturene var ugyldige:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2057,16 +2082,6 @@ msgstr ""
 "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
 "ikke er tilgjengelig:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Klarte ikke å åpne rør for %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Lesefeil fra %s-prosessen"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Venter på hoder"
@@ -2128,19 +2143,19 @@ msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Klarte ikke forkorte fila %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2177,11 +2192,16 @@ msgstr ""
 "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
 "Nåværende verdi: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2208,7 +2228,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"
@@ -2339,152 +2359,169 @@ msgstr "Klarer ikke 
 msgid "Failed to stat the cdrom"
 msgstr "Klarer ikke å få statusen på CD-spilleren"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunne ikke åpne låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Får ikke låst %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet på %s, men den ble ikke funnet"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok et minnefeilsignal."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok et minnefeilsignal."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s ga en feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avsluttet uventet"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunne ikke åpne fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Klarte ikke å åpne rør for %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem ved låsing av fila"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem ved oppdatering av fila"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenke til fila"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Pakkens lagerfil er ødelagt"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT støtter ikke versjonssystemet «%s»"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret ble bygd for en annen arkitektur"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Avhenger av"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Forutsetter"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Foreslår"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Anbefaler"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Er i konflikt med"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Nuller"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Ødelegger"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "påkrevet"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "vanlig"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "valgfri"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "tillegg"
 
@@ -2514,7 +2551,7 @@ msgstr "Klarte ikke 
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2599,7 +2636,7 @@ msgstr "Feil p
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2613,8 +2650,8 @@ msgid ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"Den forestående installasjon må midlertidig fjerne den meget viktige pakken %"
-"s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du "
+"Den forestående installasjon må midlertidig fjerne den meget viktige pakken "
+"%s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du "
 "virkelig vil det, så bruk innstillingen APT::Force-LoopBreak."
 
 #: apt-pkg/packagemanager.cc:495
@@ -2648,7 +2685,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2698,12 +2735,12 @@ msgstr "Metoden %s startet ikke korrekt"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet «%s» støttes ikke"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarer ikke bestemme en passende pakkesystemtype"
 
@@ -2717,141 +2754,163 @@ msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»."
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Det kan hende du vil kjøre «apt-get update» for å rette på disse problemene"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Forsto ikke spikring av typen %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) spesifisert for pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Lageret har et uoverensstemmende versjonssystem"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Feil oppsto under behandling av %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Feil oppsto under behandling av %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Feil oppsto under behandling av %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Feil oppsto under behandling av %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Feil oppsto under behandling av %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Feil oppsto under behandling av %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Feil oppsto under behandling av %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Feil oppsto under behandling av %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Feil oppsto under behandling av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Samler inn filtilbud"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO-feil ved lagring av kildekode-lager"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5sum"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2860,7 +2919,7 @@ msgstr ""
 "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
 "selv (fordi arkitekturen mangler)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2869,31 +2928,41 @@ msgstr ""
 "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
 "pakken selv."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Feil størrelse"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Merk, velger %s istedenfor %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avledningsfila: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Klarer ikke å fortolke pakkefila %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2946,8 +3015,8 @@ msgstr "Leter gjennom CD for indeksfiler..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu "
 "signaturer\n"
@@ -2988,143 +3057,182 @@ msgstr "Skriver ny kildeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Kildelisteoppføringer for denne CD-en er:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i feile filer.\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Åpner oppsettsfila %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hashsummen stemmer ikke"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kjører etter-installasjonsutløser %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunne ikke åpne fila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder å fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kan ikke låse listemappa"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3142,10 +3250,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Utgave «%s» av «%s» ble ikke funnet"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Versjon «%s» av «%s» ble ikke funnet"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Klarte ikke å finne oppgave %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Klarte ikke å åpne rør for %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Lesefeil fra %s-prosessen"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Feil oppsto under behandling av %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Feil på %u i kildelista %s (selgers id)"
 
@@ -3198,8 +3327,8 @@ msgstr "Forbindelsen ble uventet stengt"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n"
 
 #, fuzzy
diff --git a/po/ne.po b/po/ne.po
index 8d6504b59..39d9eaac3 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,159 +6,159 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "प्याकेज %s तोक्न असक्षम भयो"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  सामान्य प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  एकल अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  मिश्रित अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  हराइरहेको:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "कूल निर्भरताहरू:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "कूल उपलब्ध मानचित्रणहरू:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "कूल शिथिल खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "कुनै प्याकेजहरू फेला परेन"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "प्याकेज %s तोक्न असक्षम भयो"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "प्याकेज फाइलहरू:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "क्यास sync  भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "पिन गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(फेला परेन)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  स्थापना भयो:"
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  उमेद्वार:"
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(कुनै पनि होइन)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "प्याकेज पिन:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -180,6 +180,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -313,12 +314,12 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr " %s मा लेख्न असक्षम"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
 
@@ -653,79 +654,79 @@ msgstr "समस्या अनलिङ्क भइरहेछ %s"
 msgid "Failed to rename %s to %s"
 msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "तर %s स्थापना भयो"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "तर यो स्थापनायोग्य छैन"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "तर यो अवास्तविक प्याकेज होइन"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "तर यो स्थापना भएन"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "तर यो स्थापना हुन गइरहेको छैन"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr "वा"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s कारणले) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -733,140 +734,233 @@ msgstr ""
 "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
 "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu पुन: स्थापना गरियो, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu स्तर कम गरियो, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "प्याकेज %s ...द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [स्थापना भयो]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "उमेद्वार संस्करणहरू"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "तपाईँले स्थापना गर्न स्पष्ट रुपमा एउटा चयन गर्नुहोस् ।"
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"प्याकेज %s उपलब्ध छैन, तर अर्को प्याकेज द्वारा सिफारिस प्याकेज हो ।\n"
+"यसको मतलब प्याकेज हराइरहेको प्याकेज, बेकायम भयो\n"
+" अर्को स्रोतबाट मात्र उपलब्ध हुन्छ\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "निर्भरताहरू सुधार गरिदैछ..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr "असफल भयो ।"
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr "काम भयो"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -877,28 +971,28 @@ msgstr ""
 "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "परित्याग गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -906,126 +1000,57 @@ msgstr ""
 "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
 "गर्नुहुन्छ ?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "स्थापना परित्याग गरिदैछ ।"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "प्याकेज %s ...द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [स्थापना भयो]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "उमेद्वार संस्करणहरू"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "तपाईँले स्थापना गर्न स्पष्ट रुपमा एउटा चयन गर्नुहोस् ।"
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"प्याकेज %s उपलब्ध छैन, तर अर्को प्याकेज द्वारा सिफारिस प्याकेज हो ।\n"
-"यसको मतलब प्याकेज हराइरहेको प्याकेज, बेकायम भयो\n"
-" अर्को स्रोतबाट मात्र उपलब्ध हुन्छ\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1035,7 +1060,7 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1043,11 +1068,11 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1063,44 +1088,24 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "प्याकेज फेला पार्न सकिएन  %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "प्याकेज फेला पार्न सकिएन  %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "तर %s स्थापना हुनुपर्यो"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1108,7 +1113,7 @@ msgstr ""
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1121,126 +1126,151 @@ msgstr ""
 " वितरण अहिले सम्म सिर्जना\n"
 " भएको छैन वा आवगमन विनानै सर्यो ।"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "भाँचिएका प्याकेजहरू"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "सुझाव दिएका प्याकेजहरू:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "सिफारिस गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "प्याकेज फेला पार्न सकिएन  %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "स्तर वृद्धि गणना गरिदैछ..."
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "असफल भयो"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "काम भयो"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1249,30 +1279,30 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1297,6 +1327,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1355,7 +1387,7 @@ msgstr ""
 "pages हेर्नुहोस् ।\n"
 "                       APT संग सुपर काउ शक्तिहरू छ ।\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1603,9 +1635,9 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s पढ्न असफल भयो"
@@ -1634,10 +1666,9 @@ msgstr "%sinfo स्थिर गर्न असफल भयो"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "प्याकेज सूचिहरू पढिदैछ"
 
@@ -1769,12 +1800,12 @@ msgstr "डिस्क फेला परेन ।"
 msgid "File not found"
 msgstr "फाइल फेला परेन "
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "स्थिर गर्न असफल भयो"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "परिमार्जन समय सेट असफल भयो"
 
@@ -1836,7 +1867,7 @@ msgstr "जडान समय सकियो"
 msgid "Server closed the connection"
 msgstr "सर्भरले जडान बन्द गर्यो"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "त्रुटि पढ्नुहोस्"
 
@@ -1848,196 +1879,178 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि
 msgid "Protocol corruption"
 msgstr "प्रोटोकल दूषित"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "त्रुटि लेख्नुहोस्"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "एउटा सकेट सिर्जना गर्न सकेन"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "निस्क्रिय सकेट जडान गर्न सकिएन"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "सकेट बाँध्न सकिएन"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "सकेटमा सुन्न सकिएन"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "सकेट नाम निर्धारण गर्न सकिएन"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आदेश पठाउन असक्षम भयो"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "अज्ञात ठेगाना परिवार %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "डेटा सकेटको जडान समय सकियो"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "डेटा सकेट समय सकियो"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "क्वेरी"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "आह्वान गर्न असक्षम भयो"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जना गर्न सकिएन"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s मा जडान गरिदैछ"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s' हल गर्न सकिएन"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' हल गर्दा अस्थायी असफल"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "स्थापना परित्याग गरिदैछ ।"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "%s को लागि पाइप खोल्न सकिएन"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "हेडरहरुको लागि पर्खिदैछ"
@@ -2099,20 +2112,20 @@ msgstr "सर्भरबाट त्रुटि पढिदैछ । द
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "फाइल %s लेख्न असफल भयो"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
@@ -2147,11 +2160,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2178,7 +2196,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "चयन %s फेला पार्न सकिएन"
@@ -2309,152 +2327,169 @@ msgstr "%s मा परिवर्तन गर्न असक्षम"
 msgid "Failed to stat the cdrom"
 msgstr "सिडी रोम स्थिर गर्न असफल भयो"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ताल्चा प्राप्त गर्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "%s को लागि पाइप खोल्न सकिएन"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "फाइल बन्द गर्दा समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "फाइल गुप्तिकरण गर्दा समस्या"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "फाइल अनलिङ्क गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "खाली प्याकेज क्यास"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "आधारित"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "पुन:आधारित"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "सुझाव दिन्छ"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "सिफारिस गर्दछ"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "द्वन्दहरू"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "बदल्छ"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "वेकायमहरू"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "महत्वपूर्ण"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "वैकल्पिक"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "अतिरिक्त"
 
@@ -2485,7 +2520,7 @@ msgstr "%s खोल्न असफल"
 msgid "Failed to write temporary StateFile %s"
 msgstr "फाइल %s लेख्न असफल भयो"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2570,7 +2605,7 @@ msgstr "वैरुप्य लाइन %u स्रोत सूचिमा
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2618,7 +2653,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2668,12 +2703,12 @@ msgstr "विधि %s सही रुपले सुरू हुन सक
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
 
@@ -2686,141 +2721,163 @@ msgstr "%s स्थिर गर्न असक्षम भयो ।"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "पिन टाइप %s बुझ्न सकिएन "
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ प्याकेज)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज १ प्रयोग गर्नुहोस्)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज २ प्रयोग गर्नुहोस्)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण १)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज ३ प्रयोग गर्नुहोस्)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण २)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (संकलन फाइलले उपलब्ध गर्दछ)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2829,7 +2886,7 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2838,31 +2895,41 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् ।"
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2916,8 +2983,8 @@ msgstr "अनुक्रमणिका फाइलहरुको लाग
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i  हस्ताक्षरहरू फेला परे\n"
 
 #: apt-pkg/cdrom.cc:677
@@ -2956,143 +3023,182 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i रेकर्डहरू लेखियो ।\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr " %s कनफिगर गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr " %s हटाइदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr " %s तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr " %s हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3110,10 +3216,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "जडान असमायिक बन्द भयो"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "प्याकेज फेला पार्न सकिएन  %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s को लागि पाइप खोल्न सकिएन"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण २)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)"
 
@@ -3165,8 +3293,8 @@ msgstr "जडान असमायिक बन्द भयो"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i  हस्ताक्षरहरू फेला परे\n"
 
 #, fuzzy
diff --git a/po/nl.po b/po/nl.po
index 939a11fab..7b713eb92 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,157 +9,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2010-03-16 06:52+0100\n"
 "Last-Translator: Frans Pop <elendil@planet.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Dutch\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kan pakket %s niet vinden"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Totaal aantal pakketnamen: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Totaal aantal pakketnamen: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normale pakketten: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr " Zuiver virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Losstaande virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Gemengde virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Ontbrekend: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Totaal aantal verschillende versies: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Totaal aantal verschillende beschrijvingen: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Totaal aantal vereisten: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Totaal aantal versie/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Totaal aantal Beschrijving/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Totaal aantal 'Voorziet'-toewijzingen "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Totaal aantal geglobde strings: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Totale hoeveelheid vereisten-versieruimte: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Totale onbenutte ruimte: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Totale hoeveelheid verantwoorde ruimte: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "U dient precies één patroon op te geven"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Geen pakketten gevonden"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kan pakket %s niet vinden"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Pakketbestanden:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Vastgepinde pakketten:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(niet gevonden)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Geïnstalleerd: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidaat: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(geen)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pakketpin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versietabel:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s voor %s gecompileerd op %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -180,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -315,12 +317,12 @@ msgstr ""
 "  -c=? Lees dit configuratiebestand.\n"
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan niet naar %s schrijven"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
 
@@ -658,79 +660,79 @@ msgstr "Probleem bij het ontlinken van %s"
 msgid "Failed to rename %s to %s"
 msgstr "Hernoemen van %s naar %s is mislukt"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-compilatiefout - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "De volgende pakketten hebben niet-voldane vereisten:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "maar %s is geïnstalleerd"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "maar %s zal geïnstalleerd worden"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "maar het is niet installeerbaar"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "maar het is een virtueel pakket"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "maar het is niet geïnstalleerd"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "maar het zal niet geïnstalleerd worden"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " of"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "De volgende pakketten zullen VERWIJDERD worden:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "De volgende pakketten zijn achtergehouden:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "De volgende pakketten zullen opgewaardeerd worden:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (vanwege %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -738,143 +740,241 @@ msgstr ""
 "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
 "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu opnieuw geïnstalleerd, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu gedegradeerd, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versie %s (%s) geselecteerd voor %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Pakket %s is een virtueel pakket voorzien door:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Geïnstalleerd]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Kandidaat-versies"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "U dient er één expliciet te selecteren voor installatie."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Pakket %s is niet beschikbaar, hoewel er naar verwezen wordt door\n"
+"een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n"
+"verouderd is, of enkel beschikbaar is van een andere bron\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Echter, de volgende pakketten vervangen dit:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakket %s heeft geen installeerbare kandidaat"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Let op, %s wordt geselecteerd in plaats van %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
+"gevraagd.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
+"gevraagd.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s is reeds de nieuwste versie.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s is ingesteld voor handmatige installatie.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Vereisten worden gecorrigeerd..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " mislukt."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Kan vereisten niet corrigeren"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Klaar"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Authentificatiewaarschuwing is genegeerd.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Sommige pakketten konden niet geauthentificeerd worden"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interne fout, rangschikken is niet voltooid"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "De lijst van bronnen kon niet gelezen worden."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian."
 "org te mailen"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "U heeft onvoldoende vrije schijfruimte op %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ja, doe wat ik zeg!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -885,28 +985,28 @@ msgstr ""
 "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Afbreken."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Wilt u doorgaan [J/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ophalen van %s is mislukt  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -914,131 +1014,57 @@ msgstr ""
 "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
 "fix-missing proberen?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Geen oplossing voor de missende pakketten gevonden."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Installatie wordt afgebroken."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Let op, %s wordt geselecteerd in plaats van %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
-"gevraagd.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
-"gevraagd.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Pakket %s is een virtueel pakket voorzien door:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Geïnstalleerd]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Kandidaat-versies"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "U dient er één expliciet te selecteren voor installatie."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Pakket %s is niet beschikbaar, hoewel er naar verwezen wordt door\n"
-"een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n"
-"verouderd is, of enkel beschikbaar is van een andere bron\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Echter, de volgende pakketten vervangen dit:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Pakket %s heeft geen installeerbare kandidaat"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
-"Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s is reeds de nieuwste versie.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' voor '%s' is niet gevonden"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versie '%s' voor '%s' is niet gevonden"
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Versie %s (%s) geselecteerd voor %s\n"
-
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Negeer niet beschikbare doelrelease '%s' van pakket '%s'"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "De opdracht 'update' aanvaard geen argumenten"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1052,7 +1078,7 @@ msgstr[1] ""
 "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
 "nodig:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1062,11 +1088,11 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1084,45 +1110,25 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Kon taak %s niet vinden"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Kon pakket %s niet vinden"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s is ingesteld voor handmatige installatie.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
 "lossen:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1130,7 +1136,7 @@ msgstr ""
 "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
 "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1141,123 +1147,148 @@ msgstr ""
 "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
 "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Kon pakket %s niet vinden"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s is ingesteld voor handmatige installatie.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Opwaardering wordt doorgerekend... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Klaar"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
 "worden"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "U heeft niet voldoende vrije schijfruimte op %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "U dient tenminste één pakket op te geven om de bouwvereisten van te "
 "controleren"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1266,7 +1297,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1275,32 +1306,33 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
 "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
 "is te nieuw"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1324,6 +1356,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1386,7 +1420,7 @@ msgstr ""
 "voor meer informatie en opties.\n"
 "                       Deze APT heeft Super Koe kracht.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1641,9 +1675,9 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
@@ -1673,10 +1707,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Pakketlijsten worden ingelezen"
 
@@ -1811,12 +1844,12 @@ msgstr "Schijf niet gevonden"
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "stat is mislukt"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Instellen van de aanpassingstijd is mislukt"
 
@@ -1878,7 +1911,7 @@ msgstr "Verbinding is verlopen"
 msgid "Server closed the connection"
 msgstr "Verbinding is verbroken door de server"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Leesfout"
 
@@ -1890,188 +1923,177 @@ msgstr "Een reactie deed de buffer overlopen"
 msgid "Protocol corruption"
 msgstr "Protocolcorruptie"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Schrijffout"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Kon geen socket aanmaken"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Kon de passieve socket niet verbinden."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kon geen luistersocket verkrijgen"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Kon geen socket binden"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Kon niet op de socket niet luisteren"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Kon de socketnaam niet bepalen"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Kan PORT-commando niet verzenden"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Onbekende adresfamilie %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT is mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Datasocket verbinding is verlopen"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kan bestand niet ophalen; bericht van server: %s"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Datasocket verliep"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Data transfer is mislukt, server zei: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Zoekopdracht"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Aanroepen mislukt van "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kon niet verbinden met %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Er wordt verbinding gemaakt met %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kon '%s' niet vinden"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tijdelijke fout bij het opzoeken van '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kan geen verbinding maken met %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Geen sleutelring geïnstalleerd in %s."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-"E: Te veel sleutelringen om door te geven aan gpgv. Er wordt afgesloten."
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt "
-"afgesloten."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
 "niet bepalen?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste één ongeldige ondertekening gevonden."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv "
 "geïnstalleerd?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Onbekende fout bij het uitvoeren van gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "De volgende ondertekeningen waren ongeldig:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2079,16 +2101,6 @@ msgstr ""
 "De volgende ondertekeningen konden niet geverifieerd worden omdat de "
 "publieke sleutel niet beschikbaar is:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Kon geen pijp openen voor %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Leesfout door proces %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
@@ -2153,19 +2165,19 @@ msgstr ""
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Afkorten van bestand is mislukt"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Interne fout"
 
@@ -2202,14 +2214,17 @@ msgstr ""
 "Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-"
 "Limit te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"De omvang van een MMap heeft de gedefinieerde limiet van %lu bytes al "
-"bereikt; de MMap wordt niet verder vergroot."
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
@@ -2235,7 +2250,7 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selectie %s niet gevonden"
@@ -2372,155 +2387,172 @@ msgstr "Kan %s niet veranderen"
 msgid "Failed to stat the cdrom"
 msgstr "stat op de CD-ROM is mislukt"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-"
 "vergrendelingsbestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kon het vergrendelingsbestand '%s' niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kon vergrendeling %s niet verkrijgen"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subproces %s ontving een segmentatiefout."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subproces %s ontving signaal %u."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subproces %s gaf de foutcode %u terug"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subproces %s sloot onverwacht af"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kon het bestand %s niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Kon geen pijp openen voor %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Probleem bij het afsluiten van het bestand"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Probleem bij het afsluiten van het bestand"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Probleem bij het synchroniseren van het bestand"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Probleem bij het ontlinken van het bestand"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Probleem bij het synchroniseren van het bestand"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Lege pakketcache"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Het pakketcachebestand is beschadigd"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Het pakketcachebestand heeft een niet-compatibele versie"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "De pakketcache was aangemaakt voor een andere architectuur"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Vereisten"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Voor-Vereisten"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Suggesties"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Aanbevelingen"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Conflicteert met"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Vervangt"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Verouderd"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Breekt"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Vult aan"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "belangrijk"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "noodzakelijk"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standaard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "optioneel"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2550,7 +2582,7 @@ msgstr "Openen van StateFile %s is mislukt"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2635,7 +2667,7 @@ msgstr "Misvormde regel %u in bronlijst %s (type)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2690,7 +2722,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2742,12 +2774,12 @@ msgstr ""
 "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
 "'enter' te drukken."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kan geen geschikt pakketsysteemtype bepalen"
 
@@ -2762,148 +2794,170 @@ msgstr ""
 "Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
 "bevatten"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "De pakketlijsten of het statusbestand konden of niet ontleed, of niet "
 "geopend worden."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Pintype %s wordt niet begrepen"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Fout tijdens verwerken van %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Fout tijdens verwerken van %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Fout tijdens verwerken van %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Fout tijdens verwerken van %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Fout tijdens verwerken van %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Fout tijdens verwerken van %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Fout tijdens verwerken van %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Fout tijdens verwerken van %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Wauw, u heeft meer pakketten dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wauw, u heeft meer versies dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aan kan "
 "overschreden."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Fout tijdens verwerken van %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Fout tijdens verwerken van %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pakket %s %s werd niet gevonden bij het verwerken van de "
 "bestandsafhankelijkheden"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Voorziene bestanden worden verzameld"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "herbenoeming is mislukt, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2912,7 +2966,7 @@ msgstr ""
 "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
 "dit pakket handmatig moet repareren (wegens missende architectuur)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2921,7 +2975,7 @@ msgstr ""
 "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
 "dit pakket handmatig moet repareren."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2929,25 +2983,35 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Grootte komt niet overeen"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kon Release-bestand %s niet ontleden"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Geen secties in Release-bestand %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Geen Hash-vermelding in Release-bestand %s"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Geen Hash-vermelding in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Geen Hash-vermelding in Release-bestand %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -3000,8 +3064,8 @@ msgstr "Er wordt gescand voor indexbestanden...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu "
 "handtekeningen gevonden\n"
@@ -3044,129 +3108,166 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i records weggeschreven.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i records weggeschreven met %i missende bestanden.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende "
 "bestanden\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Niet-bestaand bestand %s wordt overgeslagen"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Kan geen authenticatierecord vinden voor: %s"
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash-som komt niet overeen voor: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "%s wordt geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wordt geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "%s wordt verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wordt volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Post-installatie-trigger %s wordt uitgevoerd"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Map '%s' ontbreekt"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Kon het bestand %s niet openen"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wordt uitgepakt"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Configuratie van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s is geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s is verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Volledige verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
 "aangekoppeld?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "dpkg wordt uitgevoerd"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3175,20 +3276,22 @@ msgstr ""
 "Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander "
 "proces?"
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg werd onderbroken; voer handmatig 'dpkg --configure -a' uit om het "
 "probleem te verhelpen. "
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Niet vergrendeld"
 
@@ -3210,9 +3313,43 @@ msgstr ""
 "Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de patch "
 "lijkt beschadigd te zijn."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Verbinding werd voortijdig afgebroken"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Release '%s' voor '%s' is niet gevonden"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Versie '%s' voor '%s' is niet gevonden"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Kon taak %s niet vinden"
+
+#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+#~ msgstr ""
+#~ "E: Te veel sleutelringen om door te geven aan gpgv. Er wordt afgesloten."
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt "
+#~ "afgesloten."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Kon geen pijp openen voor %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Leesfout door proces %s"
+
+#~ msgid ""
+#~ "The size of a MMap has already reached the defined limit of %lu bytes,"
+#~ "abort the try to grow the MMap."
+#~ msgstr ""
+#~ "De omvang van een MMap heeft de gedefinieerde limiet van %lu bytes al "
+#~ "bereikt; de MMap wordt niet verder vergroot."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Fout tijdens verwerken van %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)"
diff --git a/po/nn.po b/po/nn.po
index 593753bf4..9870df3dc 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,158 +9,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Finn ikkje pakken %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Tal på pakkenamn: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Tal på pakkenamn: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Vanlege pakkar: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Reine virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Samansette virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Manglar: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Tal på einskildversjonar: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Tal på einskildversjonar: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Tal på krav: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Tal på ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Tal på ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Tal på tilbyr-forhold: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Tal på strengar med jokerteikn: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Storleik på kravs- og versjonsrom: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Slingringsmon: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Du må oppgi nøyaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Finn ikkje pakken %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert på %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -182,6 +182,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -317,12 +318,12 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Klarte ikkje skriva til %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
 
@@ -654,79 +655,79 @@ msgstr "Problem ved oppheving av lenkje til %s"
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet på %s til %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "men lèt seg ikkje installera"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "men er ein virtuell pakke"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "men er ikkje installert"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "men skal ikkje installerast"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Dei følgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Dei følgjande pakkane vil verta FJERNA:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Dei følgjande pakkane er haldne tilbake:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Dei følgjande pakkane vil verta oppgraderte:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -735,142 +736,240 @@ msgstr ""
 "ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
 "Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nyleg installerte, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installerte på nytt, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Merk, vel %s i staden for regex «%s»\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Merk, vel %s i staden for regex «%s»\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installert]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Kandidatversjonar"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Du må velja ein som skal installerast."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Det finst ingen tilgjengeleg versjon av pakken %s, men han er nemnt\n"
+"av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n"
+"eller er berre tilgjengeleg frå ei anna kjelde\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Dei følgjande pakkane kan brukast i staden:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Det finst ingen installasjonskandidat for pakken %s"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Merk, vel %s i staden for %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Hoppar over %s, for den er installert frå før og ikkje sett til "
+"oppgradering.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Hoppar over %s, for den er installert frå før og ikkje sett til "
+"oppgradering.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Den nyaste versjonen av %s er installert frå før.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "men %s skal installerast"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Rettar på krav ..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " mislukkast."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Klarte ikkje retta på krav"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarte ikkje minimera oppgraderingsmengda"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Ferdig"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
+msgstr ""
+"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Nokre pakkar kunne ikkje bli autentisert"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Nokre pakkar må fjernast, men fjerning er slått av."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Må henta %sB/%sB med arkiv.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Må henta %sB med arkiv.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikkje nok ledig plass i %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -881,159 +980,86 @@ msgstr ""
 "For å halda fram, må du skriva nøyaktig «%s».\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Avbryt."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du halda fram [J/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller «--"
-"fix-missing»."
+"Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller "
+"«--fix-missing»."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Merk, vel %s i staden for %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Hoppar over %s, for den er installert frå før og ikkje sett til "
-"oppgradering.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Hoppar over %s, for den er installert frå før og ikkje sett til "
-"oppgradering.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Installert]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Kandidatversjonar"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Du må velja ein som skal installerast."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Det finst ingen tilgjengeleg versjon av pakken %s, men han er nemnt\n"
-"av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n"
-"eller er berre tilgjengeleg frå ei anna kjelde\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Dei følgjande pakkane kan brukast i staden:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Det finst ingen installasjonskandidat for pakken %s"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Den nyaste versjonen av %s er installert frå før.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Fann ikkje utgåva «%s» av «%s»"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Fann ikkje versjonen «%s» av «%s»"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Vald versjon %s (%s) for %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Klarte ikkje få status på kjeldepakkelista %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1043,7 +1069,7 @@ msgid_plural ""
 msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1051,11 +1077,11 @@ msgid_plural ""
 msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1071,44 +1097,25 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Fann ikkje pakken %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Fann ikkje pakken %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Merk, vel %s i staden for regex «%s»\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "men %s skal installerast"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
+msgstr ""
+"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1116,7 +1123,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
 "ei løysing)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1128,127 +1135,152 @@ msgstr ""
 "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
 "er laga enno eller at dei framleis ligg i «Incoming»."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Øydelagde pakkar"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Føreslåtte pakkar:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Tilrådde pakkar"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Fann ikkje pakken %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "men %s skal installerast"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Ferdig"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Må henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1257,31 +1289,31 @@ msgstr ""
 "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
 "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Støtta modular:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1306,6 +1338,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1365,7 +1399,7 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1611,9 +1645,9 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
@@ -1643,10 +1677,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Infokatalogen og den mellombelse katalogen må vera på det same filsystemet"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Les pakkelister"
 
@@ -1782,12 +1815,12 @@ msgstr "Fann ikkje fila"
 msgid "File not found"
 msgstr "Fann ikkje fila"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Klarte ikkje få status"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
@@ -1849,7 +1882,7 @@ msgstr "Tidsavbrot p
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1861,197 +1894,178 @@ msgstr "Eit svar flaumde over bufferen."
 msgid "Protocol corruption"
 msgstr "Protokolløydeleggjing"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Klarte ikkje oppretta sokkel"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot på sambandet"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Klarte ikkje kopla til passiv sokkel."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Klarte ikkje binda til sokkel"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Klarte ikkje lytta til sokkel"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikkje avgjera sokkelnamnet"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Klarte ikkje senda PORT-kommandoen"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjend adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrot på tilkopling til datasokkel"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikkje henta fila, tenaren sa «%s»"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Tidsavbrot på datasokkelen"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringa mislukkast, tenaren sa «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Spørjing"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot på sambandet"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikkje kopla til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar til %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikkje slå opp «%s»"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Mellombels feil ved oppslag av «%s»"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Det hende noko dumt ved oppslag av «%s:%s» (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Avbryt installasjon."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Klarte ikkje opna røyr for %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Lesefeil frå %s-prosessen"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Ventar på hovud"
@@ -2113,20 +2127,20 @@ msgstr "Feil ved lesing fr
 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Klarte ikkje skriva fila %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2161,11 +2175,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2192,7 +2211,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"
@@ -2323,152 +2342,169 @@ msgstr "Klarte ikkje byta til %s"
 msgid "Failed to stat the cdrom"
 msgstr "Klarte ikkje få status til CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Brukar ikkje låsing for den skrivebeskytta låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikkje opna låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Brukar ikkje låsing for den nfs-monterte låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Klarte ikkje låsa %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta på %s, men den fanst ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Klarte ikkje opna røyr for %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lese, har framleis %lu att å lesa, men ingen att"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem ved låsing av fila"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem ved synkronisering av fila"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Pakkelagerfila er øydelagd"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT støttar ikkje versjonssystemet «%s»"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Krav"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Forslag"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Tilrådingar"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Konflikt"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "påkravd"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "vanleg"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "tillegg"
 
@@ -2499,7 +2535,7 @@ msgstr "Klarte ikkje opna %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikkje skriva fila %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2584,7 +2620,7 @@ msgstr "Misforma linje %u i kjeldelista %s (type)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2634,7 +2670,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2687,12 +2723,12 @@ msgstr ""
 " «%s»\n"
 "i stasjonen «%s» og trykk Enter.\n"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet «%s» er ikkje støtta"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
 
@@ -2705,142 +2741,164 @@ msgstr "Klarte ikkje f
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du må leggja nokre kjelde-URI-ar i fila sources.list."
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Du vil kanskje prøva å retta på desse problema ved å køyra «apt-get update»."
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Skjønar ikkje spikringstypen %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) oppgitt for spiker"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Feil ved behandling av %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Feil ved behandling av %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Feil ved behandling av %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Feil ved behandling av %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Feil ved behandling av %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Feil ved behandling av %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Feil ved behandling av %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Feil ved behandling av %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Feil ved behandling av %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Jøss, du har overgått talet på krav som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Feil ved behandling av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Feil ved behandling av %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikkje få status på kjeldepakkelista %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Samlar inn filtilbod"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IU-feil ved lagring av kjeldelager"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "endring av namn mislukkast, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2849,7 +2907,7 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
 "(fordi arkitekturen manglar)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2857,32 +2915,42 @@ msgid ""
 msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Merk, vel %s i staden for %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avleiingsfila: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2936,8 +3004,8 @@ msgstr "Leitar etter indeksfiler p
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
 #: apt-pkg/cdrom.cc:677
@@ -2976,143 +3044,182 @@ msgstr "Skriv ny kjeldeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppføringar for denne disken er:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilrådingar"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Klarte ikkje låsa listekatalogen"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3130,10 +3237,29 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Fann ikkje utgåva «%s» av «%s»"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Fann ikkje versjonen «%s» av «%s»"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Fann ikkje pakken %s"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Klarte ikkje opna røyr for %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Lesefeil frå %s-prosessen"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Feil ved behandling av %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)"
 
@@ -3186,8 +3312,8 @@ msgstr "Sambandet vart uventa stengd"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
 #, fuzzy
diff --git a/po/pl.po b/po/pl.po
index 699453964..763f5988b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,157 +10,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.23.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-09-27 03:42+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakiet %s w wersji %s ma niespełnione zależności:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nie udało się odnaleźć pakietu %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Liczba nazw pakietów: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Liczba nazw pakietów: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Zwykłych pakietów: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Czysto wirtualnych pakietów: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pojedynczych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Mieszanych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Brakujących: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "W sumie różnych wersji: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "W sumie różnych opisów: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "W sumie zależności: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "W sumie zależności wersja/plik: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "W sumie zależności opis/plik: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "W sumie mapowań zapewnień: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "W sumie dopasowanych napisów: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Sumaryczny rozmiar obszaru zależności od wersji: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Całkowity rozmiar: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Plik pakietu %s jest przestarzały."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Należy podać dokładnie jeden wzorzec"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nie znaleziono żadnych pakietów"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nie udało się odnaleźć pakietu %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Plików pakietów:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Magazyn podręczny jest przestarzały, nie można odwołać się (x-ref) do pliku "
 "pakietu."
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Przypięte pakiety:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nieznaleziony)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Zainstalowana: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandydująca: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(brak)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Sposób przypięcia: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s dla %s skompilowany %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -181,6 +182,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -315,12 +317,12 @@ msgstr ""
 "  -c=? Czyta wskazany plik konfiguracyjny.\n"
 "  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nie udało się pisać do %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
 
@@ -658,79 +660,79 @@ msgstr "Problem przy usuwaniu %s"
 msgid "Failed to rename %s to %s"
 msgstr "Nie udało się zmienić nazwy %s na %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "T"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Błąd kompilacji wyrażenia regularnego - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Następujące pakiety mają niespełnione zależności:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s jest zainstalowany"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s ma zostać zainstalowany"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ale nie da się go zainstalować"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ale jest pakietem wirtualnym"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ale nie jest zainstalowany"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ale nie zostanie zainstalowany"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " lub"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Następujące pakiety zostaną USUNIĘTE:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Następujące pakiety zostały zatrzymane:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Następujące pakiety zostaną zaktualizowane:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (z powodu %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -738,142 +740,238 @@ msgstr ""
 "UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
 "Nie powinno się tego robić, chyba że dokładnie wiesz co robisz!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu przeinstalowywanych, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu cofniętych wersji, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Wybrano wersję %s (%s) dla %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Zainstalowany]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Kandydujące wersje"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Należy jednoznacznie wybrać jeden z nich do instalacji."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Pakiet %s nie ma dostępnej wersji, ale odnosi się do niego inny pakiet.\n"
+"Zazwyczaj oznacza to, że pakietu brakuje, został zastąpiony przez inny\n"
+"pakiet lub nie jest dostępny przy pomocy obecnie ustawionych źródeł.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Jednak następujące pakiety go zastępują:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakiet %s nie ma kandydata do instalacji"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Uwaga, wybieranie %s zamiast %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s jest już w najnowszej wersji.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Naprawianie zależności..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " nie udało się."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Nie udało się naprawić zależności"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Nie udało się zminimalizować zbioru aktualizacji"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Gotowe"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Ostrzeżenie uwierzytelniania zignorowano.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Zainstalować te pakiety bez weryfikacji [t/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Były problemy, a użyto -y bez --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, InstallPackages użyto z uszkodzonymi pakietami!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny, sortowanie niezakończone"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Nie udało się odczytać list źródeł."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Dziwne. Rozmiary się nie zgadzają, proszę to zgłosić pod apt@packages.debian."
 "org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Konieczne pobranie %sB archiwów.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Nakazano wykonywać tylko trywialne operacje, a to nie jest trywialne."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Tak, rób jak mówię!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -884,28 +982,28 @@ msgstr ""
 "Aby kontynuować wpisz zdanie \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Przerwane."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Kontynuować [T/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie udało się pobrać %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Ukończono pobieranie w trybie samego pobierania"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -913,129 +1011,57 @@ msgstr ""
 "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get "
 "update lub użyć opcji --fix-missing"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Nie udało się poprawić brakujących pakietów."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Przerywanie instalacji"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Uwaga, wybieranie %s zamiast %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Zainstalowany]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Kandydujące wersje"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Należy jednoznacznie wybrać jeden z nich do instalacji."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Pakiet %s nie ma dostępnej wersji, ale odnosi się do niego inny pakiet.\n"
-"Zazwyczaj oznacza to, że pakietu brakuje, został zastąpiony przez inny\n"
-"pakiet lub nie jest dostępny przy pomocy obecnie ustawionych źródeł.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Jednak następujące pakiety go zastępują:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Pakiet %s nie ma kandydata do instalacji"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
-"Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s jest już w najnowszej wersji.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Wybrano wersję %s (%s) dla %s\n"
-
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Polecenie update nie wymaga żadnych argumentów"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1049,7 +1075,7 @@ msgstr[1] ""
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1061,11 +1087,11 @@ msgstr[1] ""
 "%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane.\n"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1083,43 +1109,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Nie udało się odnaleźć zadania %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Nie udało się odnaleźć pakietu %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1127,7 +1133,7 @@ msgstr ""
 "Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez "
 "pakietów (lub podać rozwiązanie)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1139,123 +1145,148 @@ msgstr ""
 "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
 "z katalogu Incoming (\"Przychodzące\")."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Pakiety są uszkodzone"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nie udało się odnaleźć pakietu %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Obliczanie aktualizacji..."
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Nie udało się"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Gotowe"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Nie udało się zablokować katalogu pobierania"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
 "źródła"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobierz źródło %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Nie udało się pobrać niektórych archiwów."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
 "zależności dla budowania"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zależności dla budowania.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1264,7 +1295,7 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
 "pakietu %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1273,32 +1304,33 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych "
 "wersji pakietu %s nie ma odpowiedniej wersji"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
 "nowy"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nie udało się spełnić zależności %s od %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nie udało się spełnić zależności dla budowania %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności dla budowania"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1322,6 +1354,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1382,7 +1416,7 @@ msgstr ""
 "apt-get(8), sources.list(5) i apt.conf(5).\n"
 "                         Ten APT ma moce Super Krowy.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1636,9 +1670,9 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nie można czytać %s"
@@ -1667,10 +1701,9 @@ msgstr "Nie udało się wykonać operacji stat na %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Pliki info i katalog tymczasowy muszą być na tym samym systemie plików"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Czytanie list pakietów"
 
@@ -1805,12 +1838,12 @@ msgstr "Nie odnaleziono dysku."
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Nie udało się wykonać operacji stat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Nie udało się ustawić czasu modyfikacji"
 
@@ -1858,8 +1891,8 @@ msgstr ""
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
-"Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: %"
-"s"
+"Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: "
+"%s"
 
 #: methods/ftp.cc:297
 #, c-format
@@ -1874,7 +1907,7 @@ msgstr "Przekroczenie czasu połączenia"
 msgid "Server closed the connection"
 msgstr "Serwer zamknął połączenie"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Błąd odczytu"
 
@@ -1886,185 +1919,177 @@ msgstr "Odpowiedź przepełniła bufor."
 msgid "Protocol corruption"
 msgstr "Naruszenie zasad protokołu"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Błąd zapisu"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Nie udało się utworzyć gniazda"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Nie udało się połączyć pasywnego gniazda."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Nie udało się przyłączyć gniazda"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Nie udało się nasłuchiwać na gnieździe"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Nie udało się określić nazwy gniazda"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Nie można wysłać polecenia PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Nieznana rodzina adresów %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Przekroczony czas połączenia gniazda danych"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nie można pobrać pliku, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Przekroczony czas oczekiwania na dane"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Info"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Nie można wywołać "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Podłączanie do %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nie udało się utworzyć gniazda dla %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nie udało się zainicjalizować połączenia z %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nie udało się połączyć z %s:%s (%s), przekroczenie czasu połączenia"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nie udało się połączyć z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Łączenie z %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nie udało się przetłumaczyć nazwy \"%s\""
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\""
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nie udało się połączyć z %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Przerywanie instalacji"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku "
 "klucza?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest "
 "zainstalowane?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Nieznany błąd podczas uruchamiania gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Następujące podpisy były błędne:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2072,16 +2097,6 @@ msgstr ""
 "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza "
 "publicznego:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Nie udało się otworzyć potoku dla %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Błąd odczytu z procesu %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nagłówki"
@@ -2143,19 +2158,19 @@ msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Nie udało się uciąć zawartości pliku %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Połączenie nie udało się"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
@@ -2192,11 +2207,16 @@ msgstr ""
 "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
 "Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2223,7 +2243,7 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Nie odnaleziono wyboru %s"
@@ -2356,152 +2376,169 @@ msgstr "Nie udało się przejść do %s"
 msgid "Failed to stat the cdrom"
 msgstr "Nie udało się wykonać operacji stat na CDROM-ie"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nie udało się otworzyć pliku blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nie udało się uzyskać blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Oczekiwano na proces %s, ale nie było go"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s spowodował naruszenie segmentacji."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s dostał sygnał %u."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s zwrócił kod błędu (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s zakończył się niespodziewanie"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nie udało się otworzyć pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nie udało się otworzyć potoku dla %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "należało zapisać jeszcze %lu, ale nie udało się to"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problem przy zamykaniu pliku"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem przy zamykaniu pliku"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem przy zapisywaniu pliku na dysk"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problem przy usuwaniu pliku"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problem przy zapisywaniu pliku na dysk"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Pusty magazyn podręczny pakietów"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Magazyn podręczny pakietów jest uszkodzony"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Wymaga"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "PreWymaga"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Sugeruje"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Poleca"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Jest w konflikcie z"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Zastępuje"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Czyni zbędnym"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Psuje"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Rozszerza"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "ważny"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "wymagany"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standardowy"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcjonalny"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "dodatkowy"
 
@@ -2531,7 +2568,7 @@ msgstr "Nie udało się otworzyć pliku stanu %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2616,7 +2653,7 @@ msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2666,7 +2703,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2716,12 +2753,12 @@ msgstr "Metoda %s nie uruchomiła się poprawnie"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "System pakietów \"%s\" nie jest obsługiwany"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nie udało się określić odpowiedniego typu systemu pakietów"
 
@@ -2734,142 +2771,164 @@ msgstr "Nie udało się wykonać operacji stat na pliku %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nierozpoznany typ przypinania %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Brak (lub zerowy) priorytet przypięcia"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Magazyn podręczny ma niezgodny system wersji"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Och, przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Och, przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Och, przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Och, przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Wystąpił błąd podczas przetwarzania %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Zbieranie zapewnień plików"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Błędna suma MD5"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Błędna suma kontrolna"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2878,7 +2937,7 @@ msgstr ""
 "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
 "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2887,32 +2946,42 @@ msgstr ""
 "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
 "będzie ręcznie naprawić ten pakiet."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Błędny rozmiar"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nie udało się zanalizować pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Brak sekcji w pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Brak wpisu Hash w pliku Release %s"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Brak wpisu Hash w pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Brak wpisu Hash w pliku Release %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2965,8 +3034,8 @@ msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów "
 "tłumaczeń i %zu podpisów\n"
@@ -3009,127 +3078,164 @@ msgstr "Zapisywanie nowej listy źródeł\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Źródła dla tej płyty to:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisano %i rekordów.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Otwieranie pliku konfiguracyjnego %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Błędna suma kontrolna"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Instalowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Całkowicie usunięto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Uruchamianie wyzwalacza post-installation %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Brakuje katalogu \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nie udało się otworzyć pliku %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Przygotowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozpakowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Przygotowanie do konfiguracji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Zainstalowany %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Przygotowanie do usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Usunięto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Przygotowanie do całkowitego usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Całkowicie usunięto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie "
 "zamontowane?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "Uruchamianie dpkg"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3138,21 +3244,23 @@ msgstr ""
 "Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go "
 "używa?"
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 "Nie udało się zablokować katalogu administracyjnego (%s), czy jesteś rootem?"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg został przerwany, należy ręcznie uruchomić \"dpkg --configure -a\" aby "
 "naprawić problem."
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Nie zablokowany"
 
@@ -3170,10 +3278,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Połączenie zostało zamknięte przedwcześnie"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Nie udało się odnaleźć zadania %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nie udało się otworzyć potoku dla %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Błąd odczytu z procesu %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr ""
 #~ "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)"
diff --git a/po/pt.po b/po/pt.po
index be123b9dc..ac7bb0bee 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,156 +7,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-09-09 20:54+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Não foi possível encontrar o pacote %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Total de nomes de pacotes: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total de nomes de pacotes: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes puramente virtuais: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Faltam: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/ficheiro: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Ficheiro: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Total de Mapeamentos 'Provides': "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Total de strings globbed: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Espaço total de dependência de versão: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Espaço total desperdiçado: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Espaço total contabilizado: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s está dessincronizado."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
-msgstr "Você deve dar exactamente um pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
+msgstr "Você deve passar exatamente um padrão"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Não foi encontrado nenhum pacote"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Não foi possível encontrar o pacote %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados: "
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Marcação do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -177,6 +178,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -313,12 +315,12 @@ msgstr ""
 "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Não conseguiu escrever para %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
 
@@ -654,79 +656,79 @@ msgstr "Problema ao executar unlinking %s"
 msgid "Failed to rename %s to %s"
 msgstr "Falhou renomear %s para %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "mas não vai ser instalado"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Serão instalados os seguintes NOVOS pacotes:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Serão REMOVIDOS os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Serão actualizados os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (devido a %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -734,142 +736,237 @@ msgstr ""
 "AVISO: Os seguintes pacotes essenciais serão removidos.\n"
 "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu a que foi feito o downgrade, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a remover e %lu não actualizados.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versão seleccionada %s (%s) para %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "O pacote %s é um pacote virtual disponibilizado por:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instalado]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versões candidatas"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Você deve seleccionar explicitamente um para instalar."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"O pacote %s não está disponível, mas é referenciado por outro pacote.\n"
+"Isso pode significar que o pacote falta, ou ficou obsoleto, ou\n"
+"está disponível somente a partir de outra fonte\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "No entanto, os seguintes pacotes substituem-no:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "O pacote %s não tem candidato para instalação"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Note, a seleccionar %s em vez de %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"A reinstalação de %s não é possível, o download do mesmo não pode ser "
+"feito.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s já está na versão mais recente.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s está definido para ser instalado manualmente.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "O pacote %s não está instalado, por isso não será removido\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "A corrigir dependências..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " falhou."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Não foi possível corrigir dependências"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Não foi possível minimizar o conjunto de actualizações"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Feito"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependências não satisfeitas. Tente utilizar -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação ultrapassado.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalar estes pacotes sem verificação [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Há problemas e foi utilizado -y sem --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro Interno, Ordering não terminou"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pôde ser lida."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É necessário obter %sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Após esta operação, serão utilizados %sB adicionais de espaço em disco.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço livre suficiente em %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only especificado mas isto não é uma operação trivial."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Sim, faça como eu digo!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -880,28 +977,28 @@ msgstr ""
 "Para continuar escreva a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abortado."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Deseja continuar [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -909,128 +1006,57 @@ msgstr ""
 "Não foi possível obter alguns arquivos, tente talvez correr apt-get update "
 "ou tente com --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing e troca de mídia não são suportados actualmente"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Não foi possível corrigir os pacotes em falta."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "A abortar a instalação."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Note, a seleccionar %s em vez de %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "O pacote %s não está instalado, por isso não será removido\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "O pacote %s é um pacote virtual disponibilizado por:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instalado]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versões candidatas"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Você deve seleccionar explicitamente um para instalar."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"O pacote %s não está disponível, mas é referenciado por outro pacote.\n"
-"Isso pode significar que o pacote falta, ou ficou obsoleto, ou\n"
-"está disponível somente a partir de outra fonte\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "No entanto, os seguintes pacotes substituem-no:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "O pacote %s não tem candidato para instalação"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
-"A reinstalação de %s não é possível, o download do mesmo não pode ser "
-"feito.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s já está na versão mais recente.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Não foi encontrado o Release '%s' para '%s'"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Não foi encontrada a versão '%s' para '%s'"
-
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Versão seleccionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1044,7 +1070,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1056,11 +1082,11 @@ msgstr[1] ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilize 'apt-get autoremove' para os remover."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1078,43 +1104,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte informação pode ajudar a resolver a situação:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover estragou coisas"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro Interno, AllUpgrade estragou algo"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Não foi possível encontrar a tarefa %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Impossível encontrar o pacote %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s está definido para ser instalado manualmente.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1122,7 +1128,7 @@ msgstr ""
 "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1134,123 +1140,148 @@ msgstr ""
 "distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
 "criados ou foram movidos do Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Impossível encontrar o pacote %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s está definido para ser instalado manualmente.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualização... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar acesso exclusivo ao directório de downloads"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Não foi possível encontrar um pacote de código fonte para %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Você não possui espaço livre suficiente em %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "É necessário obter %sB de arquivos de código fonte.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter código fonte %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve especificar pelo menos um pacote para verificar as dependências de "
 "compilação"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Não foi possível obter informações de dependências de compilação para %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1259,7 +1290,7 @@ msgstr ""
 "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
 "pôde ser encontrado"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1268,32 +1299,32 @@ msgstr ""
 "a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
 "disponível do pacote %s pode satisfazer os requisitos de versão"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
 "demasiado novo"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falha ao satisfazer a dependência %s para %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Não foi possível satisfazer as dependências de compilação para %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1318,6 +1349,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1380,7 +1413,7 @@ msgstr ""
 "sources.list(5) e apt.conf(5)\n"
 "                         Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1632,9 +1665,9 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Não foi possível ler %s"
@@ -1664,10 +1697,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Os directórios info e temp precisam estar no mesmo sistema de ficheiros"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "A ler as listas de pacotes"
 
@@ -1800,12 +1832,12 @@ msgstr "Disco não encontrado."
 msgid "File not found"
 msgstr "Ficheiro não encontrado"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Falhou o stat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Falhou definir hora de modificação"
 
@@ -1867,7 +1899,7 @@ msgstr "Foi atingido o tempo limite de ligação"
 msgid "Server closed the connection"
 msgstr "O servidor fechou a ligação"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erro de leitura"
 
@@ -1879,186 +1911,177 @@ msgstr "Uma resposta sobrecarregou o buffer"
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erro de escrita"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível ligar socket de dados, a ligação expirou"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Não foi possível ligar socket passivo."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer o bind a um socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Não foi possível executar listen no socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Não foi possível enviar o comando PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Ligação de socket de dados expirou"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Expirou o tempo do socket de dados"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "A transferência de dados falhou, o servidor respondeu '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Não foi possível invocar "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "A Ligar a %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Não posso iniciar a ligação para %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Não foi possível ligar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "A ligar a %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Não foi possível resolver '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporária a resolver '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Não foi possível ligar a %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "A abortar a instalação."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
 "digital da chave?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido ao executar gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2066,16 +2089,6 @@ msgstr ""
 "As seguintes assinaturas não puderam ser verificadas porque a chave pública "
 "não está disponível:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Não foi possível abrir pipe para %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Erro de leitura do processo %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "A aguardar por cabeçalhos"
@@ -2137,19 +2150,19 @@ msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Falhou truncar o ficheiro"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2184,11 +2197,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2215,7 +2233,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "A selecção %s não foi encontrada"
@@ -2348,155 +2366,172 @@ msgstr "Impossível mudar para %s"
 msgid "Failed to stat the cdrom"
 msgstr "Impossível executar stat ao cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Não foi possível abrir ficheiro de lock %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via "
 "nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Não foi possível obter acesso exclusivo a %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas não estava lá"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O sub-processo %s recebeu uma falha de segmentação."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O sub-processo %s recebeu uma falha de segmentação."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O sub-processo %s retornou um código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O sub-processo %s terminou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir ficheiro o %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Não foi possível abrir pipe para %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escrito, ainda restam %lu para escrever mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problema ao fechar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problema ao fechar o ficheiro"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problema sincronizando o ficheiro"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problema ao remover o link ao ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o ficheiro"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazia"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "O ficheiro de cache de pacotes é de uma versão incompatível"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT não suporta o sistema de versões '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "A cache de pacotes foi gerada para uma arquitectura diferente"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Em Conflito"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "necessário"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2526,7 +2561,7 @@ msgstr "Falhou abrir o StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falha escrever ficheiro temporário StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2611,7 +2646,7 @@ msgstr "Linha malformada %u na lista de fontes %s (tipo)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2664,7 +2699,7 @@ msgstr ""
 "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
 "estragados."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2715,12 +2750,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistema de empacotamento '%s' não é suportado"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 "Não foi possível determinar um tipo de sistema de empacotamento adequado"
@@ -2734,149 +2769,171 @@ msgstr "Não foi possível fazer stat %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
 "aberto."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Não foi possível entender o tipo de marca (pin) %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "A cache possui um sistema de versões incompatível"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Ocorreu um erro ao processar %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Ocorreu um erro ao processar %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Ocorreu um erro ao processar %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Ocorreu um erro ao processar %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Ocorreu um erro ao processar %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Ocorreu um erro ao processar %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Ocorreu um erro ao processar %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Ocorreu um erro ao processar %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Ocorreu um erro ao processar %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
 "suportar."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de dependências que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Ocorreu um erro ao processar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Ocorreu um erro ao processar %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "A obter File Provides"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Erro de I/O ao gravar a cache de código fonte"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falhou renomear, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum não coincide"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Código de verificação hash não coincide"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Não existe qualquer chave pública disponível para as seguintes IDs de "
 "chave:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2886,7 +2943,7 @@ msgstr ""
 "significar que você precisa corrigir manualmente este pacote. (devido a "
 "arquitectura em falta)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2895,7 +2952,7 @@ msgstr ""
 "Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
 "que você precisa consertar manualmente este pacote."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2903,25 +2960,35 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Note, a seleccionar %s em vez de %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linha inválida no ficheiro de desvio: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2974,8 +3041,8 @@ msgstr "A pesquisar os ficheiros de índice do disco..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu "
 "índices de tradução e %zu assinaturas\n"
@@ -3016,147 +3083,186 @@ msgstr "A escrever lista de novas source\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas de listas de Source para este Disco são:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
 "coincidentes\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "A abrir o ficheiro de configuração %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Código de verificação hash não coincide"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "A correr o 'trigger' de pós-instalação %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir ficheiro o %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A preparar a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A preparar para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
 "montado?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Impossível criar acesso exclusivo ao directório de listas"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3174,10 +3280,36 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Ligação encerrada prematuramente"
 
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "Você deve dar exactamente um pattern"
+
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Não foi encontrado o Release '%s' para '%s'"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Não foi encontrada a versão '%s' para '%s'"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Não foi possível encontrar a tarefa %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A "
+#~ "sair."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Não foi possível abrir pipe para %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Erro de leitura do processo %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
 
@@ -3229,8 +3361,8 @@ msgstr "Ligação encerrada prematuramente"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n"
 
@@ -3308,9 +3440,6 @@ msgstr "Ligação encerrada prematuramente"
 #~ msgid "Replaced file "
 #~ msgstr "Substitui"
 
-#~ msgid "You must give at least one file name"
-#~ msgstr "Você deve passar exatamente um padrão"
-
 #~ msgid "Regex compilation error"
 #~ msgstr "Erro de compilação de regex - %s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 85f449433..af6992ca4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,158 +7,159 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossível encontrar o pacote %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes puramente virtuais: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Faltando: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/arquivo: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Arquivo: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Total de mapeamentos \"Provides\": "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Total de strings \"globbed\": "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Total de espaço de dependência de versão: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Total de espaço frouxo: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Total de espaço contabilizado para: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O arquivo de pacote %s está fora de sincronia."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Você deve passar exatamente um padrão"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nenhum pacote encontrado"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossível encontrar o pacote %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Arquivos de pacote:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "O cache está fora de sincronia, não foi possível fazer a referência cruzada "
 "de um arquivo de pacote"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pacotes alfinetados (\"pinned\"):"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pacote alfinetado (\"pin\"): "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -179,6 +180,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -317,12 +319,12 @@ msgstr ""
 "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossível escrever para %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?"
 
@@ -659,79 +661,79 @@ msgstr "Problema removendo %s"
 msgid "Failed to rename %s to %s"
 msgstr "Falhou ao renomear %s para %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Os pacotes a seguir têm dependências desencontradas:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "mas não será instalado"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Os NOVOS pacotes a seguir serão instalados:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Os pacotes a seguir serão REMOVIDOS:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Os pacotes a seguir serão atualizados:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os pacotes a seguir serão REVERTIDOS:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por causa de %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -740,143 +742,236 @@ msgstr ""
 "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
 "fazendo!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a serem removidos e %lu não atualizados.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Nota, selecionando %s para expressão regular '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Nota, selecionando %s para expressão regular '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versão selecionada %s (%s) para %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "O pacote %s é um pacote virtual fornecido por:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instalado]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versões candidatas"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Você deveria selecionar explicitamente um para instalar."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"O pacote %s não está disponível, mas é referenciado por outro pacote.\n"
+"Isto pode significar que o pacote está faltando, ficou obsoleto ou\n"
+"está disponível somente a partir de outra fonte\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "No entanto, os pacotes a seguir o substituem:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "O pacote %s não tem candidato para instalação"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Nota, selecionando %s ao invés de %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s já é a versão mais nova.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s configurado para instalar manualmente.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "O pacote %s não está instalado, então não será removido\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Corrigindo dependências..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " falhou."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Impossível corrigir dependências"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossível minimizar o conjunto de atualizações"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Pronto"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependências desencontradas. Tente usar -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação sobreposto.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalar estes pacotes sem verificação [s/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Há problemas e -y foi usado sem --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, Ordenação não finalizou"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pode ser lida."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Que estranho.. Os tamanhos não batem, mande e-mail para apt@packages.debian."
 "org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É preciso baixar %sB/%sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É preciso baixar %sB de arquivos.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Depois desta operação, %sB adicionais de espaço em disco serão usados.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço suficiente em %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Sim, faça o que eu digo!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -887,28 +982,28 @@ msgstr ""
 "Para continuar digite a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abortar."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Você quer continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -916,126 +1011,57 @@ msgstr ""
 "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
 "com --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing e troca de mídia não são suportados atualmente"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Impossível corrigir pacotes faltantes."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Abortando instalação."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, selecionando %s ao invés de %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "O pacote %s não está instalado, então não será removido\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "O pacote %s é um pacote virtual fornecido por:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instalado]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versões candidatas"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Você deveria selecionar explicitamente um para instalar."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"O pacote %s não está disponível, mas é referenciado por outro pacote.\n"
-"Isto pode significar que o pacote está faltando, ficou obsoleto ou\n"
-"está disponível somente a partir de outra fonte\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "No entanto, os pacotes a seguir o substituem:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "O pacote %s não tem candidato para instalação"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s já é a versão mais nova.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' para '%s' não foi encontrada"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versão '%s' para '%s' não foi encontrada"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Versão selecionada %s (%s) para %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1049,7 +1075,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1061,11 +1087,11 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' para removê-los."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1083,43 +1109,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "A informação a seguir pode ajudar a resolver a situação:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade quebrou coisas"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Impossível achar tarefa %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Impossível achar pacote %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s configurado para instalar manualmente.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1127,7 +1133,7 @@ msgstr ""
 "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1139,121 +1145,146 @@ msgstr ""
 "distribuição instável, que alguns pacotes requeridos não foram\n"
 "criados ainda ou foram retirados da \"Incoming\"."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serão instalados:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Impossível achar pacote %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s configurado para instalar manualmente.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Calculando atualização... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar trava no diretório de download"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossível encontrar um pacote fonte para %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Você não possui espaço livre suficiente em %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Preciso obter %sB de arquivos fonte.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construção '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve-se especificar pelo menos um pacote para que se cheque as dependências "
 "de construção"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossível conseguir informações de dependência de construção para %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1262,7 +1293,7 @@ msgstr ""
 "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
 "pode ser encontrado"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1271,32 +1302,32 @@ msgstr ""
 "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
 "disponível do pacote %s pode satisfazer os requerimentos de versão"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
 "novo"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Não foi possível satisfazer as dependências de compilação para %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1321,6 +1352,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1382,7 +1415,7 @@ msgstr ""
 "para mais informações e opções.\n"
 "                       Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1635,9 +1668,9 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossível ler %s"
@@ -1666,10 +1699,9 @@ msgstr "Falhou ao executar \"stat\" em %sinfo."
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Lendo listas de pacotes"
 
@@ -1803,12 +1835,12 @@ msgstr "Disco não encontrado."
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Falhou ao executar \"stat\""
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Falhou ao definir hora de modificação"
 
@@ -1870,7 +1902,7 @@ msgstr "Conexão expirou"
 msgid "Server closed the connection"
 msgstr "Servidor fechou a conexão"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erro de leitura"
 
@@ -1882,186 +1914,177 @@ msgstr "Uma resposta sobrecarregou o buffer"
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erro de escrita"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível conectar um socket de dados, conexão expirou"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Não foi possível conectar um socket passivo."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer \"bind\" de um socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Não foi possível ouvir no socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Impossível enviar o comando PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, servidor disse: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Conexão do socket de dados expirou"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossível obter arquivo, servidor disse '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Socket de dados expirou"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferência de dados falhou, servidor disse '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Impossível invocar "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Não foi possível iniciar a conexão para %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Não foi possível conectar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Não foi possível resolver '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporária resolvendo '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossível conectar em %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Abortando instalação."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
 "digital da chave?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido executando gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2069,16 +2092,6 @@ msgstr ""
 "As assinaturas a seguir não puderam ser verificadas devido à chave pública "
 "não estar disponível:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Não foi possível abrir \"pipe\" para %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Erro de leitura do processo %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
@@ -2140,19 +2153,19 @@ msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Falhou ao truncar arquivo"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2187,11 +2200,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2218,7 +2236,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Seleção %s não encontrada"
@@ -2352,152 +2370,169 @@ msgstr "Impossível mudar para %s"
 msgid "Failed to stat the cdrom"
 msgstr "Impossível executar \"stat\" no cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Não usando travamento para arquivo de trava somente leitura %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Não foi possível abrir arquivo de trava %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Não usando travamento para arquivo de trava montado via nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Não foi possível obter trava %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este não estava lá"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-processo %s recebeu uma falha de segmentação."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Sub-processo %s recebeu uma falha de segmentação."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-processo %s retornou um código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Sub-processo %s finalizou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Não foi possível abrir \"pipe\" para %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problema fechando o arquivo"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problema sincronizando o arquivo"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problema removendo o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o arquivo"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazio"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "O arquivo de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "O arquivo de cache de pacotes é uma versão incompatível"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT não suporta o sistema de versões '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "O cache de pacotes foi gerado para uma arquitetura diferente"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Conflita"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Quebra"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "requerido"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2527,7 +2562,7 @@ msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2617,7 +2652,7 @@ msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2668,7 +2703,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2719,12 +2754,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistema de empacotamento '%s' não é suportado"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
 
@@ -2737,147 +2772,169 @@ msgstr "Impossível executar \"stat\" %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "As listas de pacotes ou os arquivos de estado não puderam ser analisados ou "
 "abertos."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Não foi possível entender o tipo de \"pin\" %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "O cache possui um sistema de versões incompatível"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Um erro ocorreu processando %s (NovoPacote)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Um erro ocorreu processando %s (UsePacote1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Um erro ocorreu processando %s (NovoArquivoDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Um erro ocorreu processando %s (UsePacote2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Um erro ocorreu processando %s (NovaVersão1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Um erro ocorreu processando %s (UsePacote3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Um erro ocorreu processando %s (NovaVersão2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Um erro ocorreu processando %s (NovoArquivoDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
 "suportar."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de dependências que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Coletando Arquivo \"Provides\""
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Erro de E/S ao gravar cache fonte"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "renomeação falhou, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2887,7 +2944,7 @@ msgstr ""
 "que você precisa consertar manualmente este pacote. (devido a arquitetura "
 "não especificada)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2896,7 +2953,7 @@ msgstr ""
 "Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
 "que você precisa consertar manualmente este pacote."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2904,25 +2961,35 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossível analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Nota, selecionando %s ao invés de %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linha inválida no arquivo de desvios: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2975,8 +3042,8 @@ msgstr "Procurando por arquivos de índice no disco..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu "
 "índice(s) de traduções e %zu assinatura(s)\n"
@@ -3017,145 +3084,184 @@ msgstr "Gravando nova lista de fontes\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Entradas na lista de fontes para este disco são:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Gravados %i registros.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Gravados %i registros com %i arquivos faltando.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Gravados %i registros com %i arquivos que não combinam\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Gravados %i registros com %i arquivos faltando e %i arquivos que não "
 "combinam\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Abrindo arquivo de configuração %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Removendo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Executando gatilho pós-instalação %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Diretório '%s' está faltando"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempacotando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparando para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparando para a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparando para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Impossível criar trava no diretório de listas"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3173,10 +3279,35 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Conexão encerrada prematuramente"
 
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "Você deve passar exatamente um padrão"
+
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Release '%s' para '%s' não foi encontrada"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Versão '%s' para '%s' não foi encontrada"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Impossível achar tarefa %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Não foi possível abrir \"pipe\" para %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Erro de leitura do processo %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Um erro ocorreu processando %s (NovaVersão2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)"
 
@@ -3229,8 +3360,8 @@ msgstr "Conexão encerrada prematuramente"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i "
 #~ "assinaturas\n"
@@ -3282,9 +3413,6 @@ msgstr "Conexão encerrada prematuramente"
 #~ msgid "Replaced file "
 #~ msgstr "Substitui"
 
-#~ msgid "You must give at least one file name"
-#~ msgstr "Você deve passar exatamente um padrão"
-
 #~ msgid "Regex compilation error"
 #~ msgstr "Erro de compilação de regex - %s"
 
diff --git a/po/ro.po b/po/ro.po
index d81eda15a..28f6fd8bb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,148 +19,148 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pachetul %s versiunea %s are o dependență neîndeplinită:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nu s-a putut localiza pachetul %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Pachete normale: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Pachete virtuale pure: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Pachete virtuale singulare: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Pachete virtuale mixte: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Lipsă: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Total versiuni distincte: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Numărul total de descrieri distincte: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Total dependențe: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Total relații versiune/fișier: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Total relații desc/fișier: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Total cartări Furnizează: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Total șiruri înglobate: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Total spațiu versiuni ale dependențelor: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Total spațiu intern: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Total spațiu contorizat pentru: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fișierul pachetului %s este desincronizat."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Trebuie să dați exact un șablon"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nu s-au găsit pachete"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nu s-a putut localiza pachetul %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Fișiere pachet: "
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pachete alese special:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(negăsit)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Instalat: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidează: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(niciunul)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pachet ales special: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pentru %s compilat la %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -180,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -313,12 +315,12 @@ msgstr ""
 "  -c=? Citește acest fișier de configurare\n"
 "  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nu s-a putut scrie în %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
 
@@ -661,79 +663,79 @@ msgstr "Problemă la desfacerea %s"
 msgid "Failed to rename %s to %s"
 msgstr "Eșec la redenumirea lui %s în %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Eroare de compilare expresie regulată - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Următoarele pachete au dependențe neîndeplinite:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "dar %s este instalat"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "dar %s este pe cale de a fi instalat"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "dar nu este instalabil"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "dar este un pachet virtual"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "dar nu este instalat"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "dar nu este pe cale să fie instalat"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " sau"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Următoarele pachete NOI vor fi instalate:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Următoarele pachete vor fi ȘTERSE:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Următoarele pachete au fost reținute:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Următoarele pachete vor fi ÎNNOITE:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Următoarele pachete vor fi DE-GRADATE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Următoarele pachete ținute vor fi schimbate:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (datorită %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -741,142 +743,235 @@ msgstr ""
 "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n"
 "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu înnoite, %lu nou instalate, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalate, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu de-gradate, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu de șters și %lu neînnoite.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalate sau șterse incomplet.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versiune selectată %s (%s) pentru %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Pachetul %s este un pachet virtual furnizat de către:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Instalat]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Versiuni candidat"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Ar trebui să alegeți în mod explicit unul pentru instalare."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Pachetul %s nu este disponibil, dar este menționat de către alt pachet.\n"
+"Aceasta ar putea însemna că pachetul lipsește, s-a învechit, sau\n"
+"este disponibil numai din altă sursă\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Oricum următoarele pachete îl înlocuiesc:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pachetul %s nu are nici un candidat la instalare"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Notă, se selectează %s în locul lui %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s este deja la cea mai nouă versiune.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s este marcat ca fiind instalat manual.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Corectez dependențele..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " eșec."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Nu s-au putut corecta dependențele"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Terminat"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Avertisment de autentificare înlocuit.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalați aceste pachete fără verificare [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Unele pachete n-au putut fi autentificate"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Eroare internă, Ordering nu s-a terminat"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Ce ciudat.. Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Este nevoie să descărcați %sB de arhive.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spațiul disponibil în %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nu aveți suficient spațiu în %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Da, fă cum îți spun!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -887,28 +982,28 @@ msgstr ""
 "Pentru a continua tastați fraza '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Renunțare."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vreți să continuați [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Eșec la aducerea lui %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Descărcare completă și în modul doar descărcare"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -916,127 +1011,59 @@ msgstr ""
 "Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get "
 "update' sau încercați cu --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Nu pot corecta pachetele lipsă."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Abandonez instalarea."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Notă, se selectează %s în locul lui %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Pachetul %s este un pachet virtual furnizat de către:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Instalat]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Versiuni candidat"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Ar trebui să alegeți în mod explicit unul pentru instalare."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Pachetul %s nu este disponibil, dar este menționat de către alt pachet.\n"
-"Aceasta ar putea însemna că pachetul lipsește, s-a învechit, sau\n"
-"este disponibil numai din altă sursă\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Oricum următoarele pachete îl înlocuiesc:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Pachetul %s nu are nici un candidat la instalare"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s este deja la cea mai nouă versiune.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' pentru '%s' n-a fost găsită"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
+"The following package 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[2] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Versiune selectată %s (%s) pentru %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Nu pot determina starea listei surse de pachete %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 
 # XXX: orice sugestie este bine-venită
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1050,7 +1077,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1062,11 +1089,11 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1085,43 +1112,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Nu s-a putut găsi sarcina %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Nu pot găsi pachetul %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s este marcat ca fiind instalat manual.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1129,7 +1136,7 @@ msgstr ""
 "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
 "(sau oferiți o altă soluție)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1142,122 +1149,147 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nu pot găsi pachetul %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s este marcat ca fiind instalat manual.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Calculez înnoirea... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Eșec"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Terminat"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Nu s-a putut bloca directorul de descărcare"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nu aveți suficient spațiu în %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
 "înglobate"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1266,7 +1298,7 @@ msgstr ""
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
 "poate fi găsit"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1275,32 +1307,32 @@ msgstr ""
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
 "disponibilă a pachetului %s nu poate satisface versiunile cerute"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
 "prea nou"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1325,6 +1357,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1387,7 +1421,7 @@ msgstr ""
 "pentru mai multe informații și opțiuni.\n"
 "                       Acest APT are puterile unei Super Vaci.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1640,9 +1674,9 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
@@ -1671,10 +1705,9 @@ msgstr "Eșec la „stat” pentru %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Directoarele info și temp trebuie să fie în același sistem de fișiere"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Citire liste de pachete"
 
@@ -1812,12 +1845,12 @@ msgstr "Disc negăsit."
 msgid "File not found"
 msgstr "Fișier negăsit"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Eșec la „stat”"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Eșec la ajustarea timpului de modificare"
 
@@ -1879,7 +1912,7 @@ msgstr "Timpul de conectare a expirat"
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Eroare de citire"
 
@@ -1891,188 +1924,179 @@ msgstr "Un răspuns a depășit zona de tampon."
 msgid "Protocol corruption"
 msgstr "Protocol corupt"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Eroare de scriere"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Nu s-a putut crea un socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
 "expirat"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Nu s-a putut realiza conectarea la un socket pasiv"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Nu s-a putut realiza asocierea la un socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Nu s-a putut asculta pe socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Nu s-a putut detecta numele socket-ului"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Nu s-a putut trimite comanda PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familie de adrese necunoscută %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "„EPRT” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Timpul de conectare la socket-ul de date expirat"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Timp expirat pentru socket-ul de date"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferul de date a eșuat, serverul a spus: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Interogare"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Nu s-a putut invoca"
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nu s-a putut iniția conexiunea cu %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectare la %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nu s-a putut rezolva „%s”"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Eșec temporar la rezolvarea lui „%s”"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Abandonez instalarea."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
 "amprenta digitale a cheii?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Eroare necunoscută în timp ce se execută gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Următoarele semnături nu au fost valide:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2080,16 +2104,6 @@ msgstr ""
 "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu "
 "este disponibilă:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Nu s-a putut deschide conexiunea pentru %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Eroare de citire din procesul %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "În așteptarea antetelor"
@@ -2152,19 +2166,19 @@ msgstr ""
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Eșec la trunchierea fișierului"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Eroare internă"
 
@@ -2199,11 +2213,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2230,7 +2249,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecția %s nu a fost găsită"
@@ -2364,152 +2383,169 @@ msgstr "Nu pot schimba la %s"
 msgid "Failed to stat the cdrom"
 msgstr "Eșec la „stat” pentru CD"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nu pot deschide fișierul blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nu pot determina blocajul %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Așteptat %s, dar n-a fost acolo"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subprocesul %s a întors un cod de eroare (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subprocesul %s s-a terminat brusc"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nu s-a putut deschide conexiunea pentru %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "scriere, încă mai am %lu de scris dar nu pot"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problemă la închiderea fișierului"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Problemă la închiderea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problemă în timpul sincronizării fișierului"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problemă la dezlegarea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problemă în timpul sincronizării fișierului"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Cache gol de pachet"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Cache-ul fișierului pachet este deteriorat"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Fișierul cache al pachetului este o versiune incompatibilă"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Acest APT nu suportă versioning system '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Depinde"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Pre-depinde"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Sugerează"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Recomandă"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Este în conflict"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Înlocuiește"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Învechit"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Corupe"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "cerut"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "opțional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2539,7 +2575,7 @@ msgstr "Eșec la deschiderea fișierului de stare %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Eșec la scrierea fișierului temporar de stare %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2624,7 +2660,7 @@ msgstr "Linie greșită %u în lista sursă %s (tip)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2674,7 +2710,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2725,12 +2761,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistemul de pachete '%s' nu este suportat"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
 
@@ -2743,150 +2779,172 @@ msgstr "Nu pot determina starea %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Listele de pachete sau fișierul de stare n-au putut fi analizate sau "
 "deschise."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme."
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nu s-a înțeles tipul de pin %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Fără prioritate (sau zero) specificată pentru pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache are un versioning system incompatibil"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de nume de pachete de care este capabil acest "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nu pot determina starea listei surse de pachete %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Colectare furnizori fișier"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Eroare IO în timpul salvării sursei cache"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "redenumire eșuată, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Nepotrivire MD5Sum"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Nu există nici o cheie publică disponibilă pentru următoarele "
 "identificatoare de chei:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2895,7 +2953,7 @@ msgstr ""
 "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
 "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2904,7 +2962,7 @@ msgstr ""
 "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
 "că aveți nevoie să depanați manual acest pachet."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2912,25 +2970,35 @@ msgstr ""
 "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
 "pachetul %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Notă, se selectează %s în locul lui %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2984,8 +3052,8 @@ msgstr "Scanez discul de fișierele index..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri "
 "de traduceri și %zu semnături\n"
@@ -3026,145 +3094,184 @@ msgstr "Scriere noua listă sursă\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Intrările listei surselor pentru acest disc sunt:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S-au scris %i înregistrări.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Se deschide fișierul de configurare %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Se instalează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Se configurează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Se șterge %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Se rulează declanșatorul post-instalare %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directorul „%s” lipsește."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Se pregătește %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Se despachetează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Se pregătește configurarea %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Instalat %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Se pregătește ștergerea lui %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Șters %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Se pregătește ștergerea completă a %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nu pot încuia directorul cu lista"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3182,10 +3289,32 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Conexiune închisă prematur"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Release '%s' pentru '%s' n-a fost găsită"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Nu s-a putut găsi sarcina %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nu s-a putut deschide conexiunea pentru %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Eroare de citire din procesul %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)"
 
@@ -3239,8 +3368,8 @@ msgstr "Conexiune închisă prematur"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Găsite %i indexuri de pachete, %i indexuri de surse și %i semnături\n"
 
diff --git a/po/ru.po b/po/ru.po
index ab69abd13..eab5e8f65 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,159 +13,160 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2010-01-08 09:47+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Не удалось найти пакет %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Всего имён пакетов : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Всего имён пакетов : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Обычных пакетов: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Полностью виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Одиночных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Смешанных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Отсутствует: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Всего уникальных версий: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Всего уникальных описаний: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Всего зависимостей: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Всего отношений Версия/Файл: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Всего отношений Описание/Файл: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Всего отношений Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Всего развёрнутых строк: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Всего информации о зависимостях: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Пустого места в кэше: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Полное учтённое пространство: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Список пакетов %s рассинхронизирован."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Вы должны задать только один шаблон"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Не найдено ни одного пакета"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Не удалось найти пакет %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Списки пакетов:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Зафиксированные пакеты:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(не найдено)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Установлен: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(отсутствует)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Фиксатор пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Таблица версий:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s скомпилирован %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -186,6 +187,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -315,12 +317,12 @@ msgstr ""
 "  -c=? Читать указанный файл настройки\n"
 "  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Невозможно записать в %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Невозможно определить версию debconf. Он установлен?"
 
@@ -663,80 +665,80 @@ msgstr "Не удалось удалить %s"
 msgid "Failed to rename %s to %s"
 msgstr "Не удалось переименовать %s в %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "д"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Ошибка компиляции регулярного выражения - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "но %s уже установлен"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но %s будет установлен"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "но он не может быть установлен"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "но это виртуальный пакет"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "но он не установлен"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "но он не будет установлен"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " или"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "НОВЫЕ пакеты, которые будут установлены:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Пакеты, которые будут УДАЛЕНЫ:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Пакеты, которые будут оставлены в неизменном виде:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Пакеты, которые будут обновлены:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr ""
 "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (вследствие %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -744,150 +746,243 @@ msgstr ""
 "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
 "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "обновлено %lu, установлено %lu новых пакетов, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "переустановлено %lu переустановлено, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакетов заменены на старые версии, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не установлено до конца или удалено %lu пакетов.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Выбрана версия %s (%s) для %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Установлен]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Версии-кандидаты"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Вы должны явно указать, какой именно вы хотите установить."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Пакет %s недоступен, но упомянут в списке зависимостей другого пакета.\n"
+"Это может означать, что пакет отсутствует, устарел, или доступен из "
+"источников, не упомянутых в sources.list\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Однако следующие пакеты могут его заменить:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Для пакета %s не найдены кандидаты на установку"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Переустановка %s невозможна, он не скачивается.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Уже установлена самая новая версия %s.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s установлен вручную.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Исправление зависимостей..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " не удалось."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Невозможно скорректировать зависимости"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Невозможно минимизировать набор обновлений"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Готово"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
 "f install'."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждение об аутентификации не принято в внимание.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Установить эти пакеты без проверки [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Некоторые пакеты невозможно аутентифицировать"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
 "пакетами!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакеты необходимо удалить, но удаление запрещено."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренняя ошибка, Ordering не завершилась"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необходимо скачать %sB/%sB архивов.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо скачать %sБ архивов.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
-"После данной операции, объём занятого дискового пространства возрастёт на %"
-"sB.\n"
+"После данной операции, объём занятого дискового пространства возрастёт на "
+"%sB.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
-"После данной операции, объём занятого дискового пространства уменьшится на %"
-"sB.\n"
+"После данной операции, объём занятого дискового пространства уменьшится на "
+"%sB.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не удалось определить количество свободного места в %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостаточно свободного места в %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запрошено выполнение только тривиальных операций, но это не тривиальная "
 "операция."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Да, делать, как я скажу!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -898,28 +993,28 @@ msgstr ""
 "Чтобы продолжить, введите фразу: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Аварийное завершение."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Хотите продолжить [Д/н]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не удалось получить %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Некоторые файлы скачать не удалось"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Указан режим \"только скачивание\", и скачивание завершено"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -927,126 +1022,58 @@ msgstr ""
 "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
 "или попытаться повторить запуск с ключом --fix-missing"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Аварийное завершение установки."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Установлен]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Версии-кандидаты"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Вы должны явно указать, какой именно вы хотите установить."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Пакет %s недоступен, но упомянут в списке зависимостей другого пакета.\n"
-"Это может означать, что пакет отсутствует, устарел, или доступен из "
-"источников, не упомянутых в sources.list\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Однако следующие пакеты могут его заменить:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Для пакета %s не найдены кандидаты на установку"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Переустановка %s невозможна, он не скачивается.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Уже установлена самая новая версия %s.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Выпуск '%s' для '%s' не найден"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Версия '%s' для '%s' не найдена"
+"The following package 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[2] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Выбрана версия %s (%s) для %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Игнорируется недоступный выпуск '%s' пакета '%s'"
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Используется '%s' в качестве исходного пакета вместо '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Игнорируется недоступная версия '%s' пакета '%s'"
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1060,7 +1087,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Следующие пакеты устанавливались автоматически и больше не требуются:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1069,11 +1096,11 @@ msgstr[0] "%lu пакетов было установлены автоматич
 msgstr[1] "%lu пакетов было установлены автоматически и больше не требуются.\n"
 msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Для их удаления используйте 'apt-get autoremove'."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1091,45 +1118,25 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Следующая информация, возможно, поможет вам:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутренняя ошибка, AutoRemover всё поломал"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Не удалось найти задачу %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Не удалось найти пакет %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s установлен вручную.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
 "f install':"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1137,7 +1144,7 @@ msgstr ""
 "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
 "не указывая имени пакета, (или найдите другое решение)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1148,122 +1155,147 @@ msgstr ""
 "или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
 "пакеты ещё не созданы или были удалены из Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Будут установлены следующие дополнительные пакеты:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Предлагаемые пакеты:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Не удалось найти пакет %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s установлен вручную.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Расчёт обновлений... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, исходный код которого необходимо получить"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Невозможно найти пакет с исходным кодом для %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаем уже скачанный файл '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостаточно места в %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо получить %sб архивов исходного кода.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Получение исходного кода %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Некоторые архивы не удалось получить."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки '%s' завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки '%s' завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Невозможно получить информацию о зависимостях для сборки %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1272,7 +1304,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1281,32 +1313,33 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
 "версий пакета %s не удовлетворяет требованиям"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
 "пакет %s новее, чем надо"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1330,6 +1363,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1393,7 +1428,7 @@ msgstr ""
 "содержится подробная информация и описание параметров.\n"
 "                       В APT есть коровья СУПЕРСИЛА.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1646,9 +1681,9 @@ msgstr "Файл %s/%s переписывает файл в пакете %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Невозможно прочитать %s"
@@ -1677,10 +1712,9 @@ msgstr "Не удалось получить атрибуты %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Каталоги info и temp должны находиться на одной файловой системе"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Чтение списков пакетов"
 
@@ -1814,12 +1848,12 @@ msgstr "Диск не найден."
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Не удалось получить атрибуты"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Не удалось установить время модификации"
 
@@ -1867,8 +1901,8 @@ msgstr ""
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
-"Команда '%s' сценария входа в систему завершилась неудачно, сервер сообщил: %"
-"s"
+"Команда '%s' сценария входа в систему завершилась неудачно, сервер сообщил: "
+"%s"
 
 #: methods/ftp.cc:297
 #, c-format
@@ -1883,7 +1917,7 @@ msgstr "Допустимое время ожидания для соединен
 msgid "Server closed the connection"
 msgstr "Сервер прервал соединение"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Ошибка чтения"
 
@@ -1895,187 +1929,177 @@ msgstr "Ответ переполнил буфер."
 msgid "Protocol corruption"
 msgstr "Искажение протокола"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Ошибка записи"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Не удалось создать сокет"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Не удалось присоединиться к сокету данных, время на установление соединения "
 "истекло"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Невозможно присоединить пассивный сокет"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Вызов getaddrinfo не смог получить сокет"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Невозможно присоединиться к сокету"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Не удалось принимать соединения на сокете"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Не удалось определить имя сокета"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Невозможно послать команду PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестное семейство адресов %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Команда EPRT не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Время установления соединения для сокета данных истекло"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Невозможно получить файл, сервер сообщил: '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Время ожидания соединения для сокета данных истекло"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача данных завершилась неудачно, сервер сообщил: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Запрос"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Невозможно вызвать "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Соединение с %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Невозможно инициализировать соединение с %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Не удаётся соединиться с %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Соединение с %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Не удалось найти IP адрес для %s"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Временная ошибка при попытке получить IP адрес '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Что-то странное произошло при определении '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Невозможно соединиться с %s: %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Аварийное завершение установки."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
-"работы."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестная ошибка при выполнении gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2083,16 +2107,6 @@ msgstr ""
 "Следующие подписи не могут быть проверены, так как недоступен открытый "
 "ключ:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Не удалось открыть канал для %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Ошибка чтения из процесса %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
@@ -2154,19 +2168,19 @@ msgstr "Ошибка чтения, удалённый сервер прерва
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Не удалось обрезать файл"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
@@ -2203,11 +2217,16 @@ msgstr ""
 "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
 "Текущее значение: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2234,7 +2253,7 @@ msgstr "%liмин %liс"
 msgid "%lis"
 msgstr "%liс"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Не найдено: %s"
@@ -2369,158 +2388,175 @@ msgstr "Невозможно сменить текущий каталог на %
 msgid "Failed to stat the cdrom"
 msgstr "Невозможно получить атрибуты cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Блокировка не используется, так как файл блокировки %s доступен только для "
 "чтения"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Не удалось открыть файл блокировки %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Блокировка не используется, так как файл блокировки %s находится на файловой "
 "системе nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Не удалось получить доступ к файлу блокировки %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ожидалось завершение процесса %s, но он не был запущен"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Порождённый процесс %s получил сигнал %u."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Порождённый процесс %s вернул код ошибки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Порождённый процесс %s неожиданно завершился"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Не удалось открыть файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Не удалось открыть канал для %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Проблема закрытия файла"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Проблема закрытия файла"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Проблема при синхронизации файловых буферов с диском"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Ошибка при удалении файла"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Проблема при синхронизации файловых буферов с диском"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Кэш пакетов пуст"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Кэш пакетов повреждён"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Не поддерживаемая версия кэша пакетов"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Данный APT не поддерживает систему версий '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Кэш пакетов был собран для другой архитектуры"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Зависит"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "ПредЗависит"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Предлагает"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Рекомендует"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Конфликтует"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Заменяет"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Замещает"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Ломает"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Улучшает"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "важный"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "необходимый"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "стандартный"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "необязательный"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "дополнительный"
 
@@ -2550,7 +2586,7 @@ msgstr "Не удалось открыть StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Не удалось записать временный StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2637,7 +2673,7 @@ msgstr "Искажённая строка %u в списке источнико
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Неизвестный тип '%s' в строке %u в списке источников %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2692,7 +2728,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2742,12 +2778,12 @@ msgstr "Метод %s запустился не корректно"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Менеджер пакетов '%s' не поддерживается"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Невозможно определить подходящий тип менеджера пакетов"
 
@@ -2760,140 +2796,162 @@ msgstr "Невозможно получить атрибуты %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Вы должны заполнить sources.list, поместив туда URI источников пактов"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Списки пакетов или status-файл не могут быть открыты или прочитаны."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Неизвестный тип фиксации %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Для фиксации не указан приоритет (или указан нулевой)"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Кэш имеет несовместимую систему версий"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Произошла ошибка во время обработки %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Произошла ошибка во время обработки %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Произошла ошибка во время обработки %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Произошла ошибка во время обработки %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Произошла ошибка во время обработки %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Произошла ошибка во время обработки %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Произошла ошибка во время обработки %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Произошла ошибка во время обработки %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Превышено допустимое количество имён пакетов."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Превышено допустимое количество версий."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Вах, превышено допустимое количество описаний, с которым может работать APT."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Превышено допустимое количество зависимостей."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Произошла ошибка во время обработки %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Сбор информации о Provides"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "переименовать не удалось, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum не совпадает"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Хеш сумма не совпадает"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2902,7 +2960,7 @@ msgstr ""
 "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
 "вручную исправить этот пакет (возможно, пропущен arch)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2911,31 +2969,41 @@ msgstr ""
 "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
 "вручную исправить этот пакет."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Не совпадает размер"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Невозможно разобрать содержимое файла Release (%s)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Отсутствуют разделы в файле Release (%s)"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Отсутствуют элементы Hash в файле Release (%s)"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Отсутствуют элементы Hash в файле Release (%s)"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Отсутствуют элементы Hash в файле Release (%s)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2988,11 +3056,11 @@ msgstr "Поиск на диске индексных файлов..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
-"Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и %"
-"zu для сигнатур\n"
+"Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и "
+"%zu для сигнатур\n"
 
 #: apt-pkg/cdrom.cc:677
 msgid ""
@@ -3032,129 +3100,166 @@ msgstr "Запись нового списка источников\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Записи в списке источников для этого диска:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Сохранено %i записей.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими "
 "файлами\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Пропускается несуществующий файл %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Не удалось найти аутентификационную запись для: %s"
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Не совпадает хеш сумма для: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Устанавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Настройка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Удаление %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, c-format
 msgid "Completely removing %s"
 msgstr "Выполняется полное удаление %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Выполняется послеустановочный триггер %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Отсутствует каталог %s"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Не удалось открыть файл %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Распаковывается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготавливается для настройки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Установлен %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготавливается для удаления %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Удалён %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка к полному удалению %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
 "смонтирован?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "Запускается dpkg"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3163,22 +3268,24 @@ msgstr ""
 "Не удалось выполнить блокировку управляющего каталога (%s); он уже "
 "используется другим процессом?"
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 "Не удалось выполнить блокировку управляющего каталога (%s); у вас есть права "
 "суперпользователя?"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "Работа dpkg прервана, вы должны вручную запустить 'dpkg --configure -a' для "
 "устранения проблемы. "
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Не заблокирован"
 
@@ -3200,10 +3307,33 @@ msgstr ""
 "Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) -- "
 "вероятно, повреждена заплата."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Соединение закрыто преждевременно"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Выпуск '%s' для '%s' не найден"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Версия '%s' для '%s' не найдена"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Не удалось найти задачу %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
+#~ "работы."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Не удалось открыть канал для %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Ошибка чтения из процесса %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Искажённая строка %u в списке источников %s (vendor id)"
 
diff --git a/po/sk.po b/po/sk.po
index 167995afc..97b256d7c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,152 +10,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2010-05-11 10:22+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Balík %s verzie %s má nesplnené závislosti:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nedá sa nájsť balík %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Celkom názvov balíkov: "
 
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:286
+#, fuzzy
+msgid "Total package structures: "
+msgstr "Celkom názvov balíkov: "
+
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normálnych balíkov: "
 
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Zmiešaných virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Chýbajúcich: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Celkom rôznych verzií: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Celkom rôznych popisov: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Celkom závislostí: "
 
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Celkom vzťahov ver/súbor: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Celkom vzťahov popis/súbor: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Celkom poskytnutých mapovaní: "
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Celkom globovaných reťazcov: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Celkom miesta závislých verzií: "
 
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Celkom jalového miesta: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Celkom priradeného miesta: "
 
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Súbor balíkov %s je neaktuálny."
 
-#: cmdline/apt-cache.cc:1297
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Musíte zadať práve jeden vzor"
 
-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Neboli nájdené žiadne balíky"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nedá sa nájsť balík %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Súbory balíka:"
 
-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pripevnené balíky:"
 
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(nenájdené)"
 
-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Nainštalovaná verzia: "
 
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
-msgstr "(žiadna)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+msgid "(none)"
+msgstr "(žiadna)"
+
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Pripevnený balík:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pre %s skompilovaný %s %s\n"
 
-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -176,6 +181,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -237,7 +243,12 @@ msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vložte disk do mechaniky a stlačte Enter"
 
-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:127
+#, fuzzy, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Premenovanie %s na %s zlyhalo"
+
+#: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
 
@@ -302,40 +313,40 @@ msgstr ""
 "  -c=? Načíta tento konfiguračný súbor\n"
 "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Do %s sa nedá zapisovať"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
 
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
 msgid "Package extension list is too long"
 msgstr "Zoznam rozšírení balíka je príliš dlhý"
 
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
 #, c-format
 msgid "Error processing directory %s"
 msgstr "Chyba pri spracovávaní adresára %s"
 
-#: ftparchive/apt-ftparchive.cc:251
+#: ftparchive/apt-ftparchive.cc:258
 msgid "Source extension list is too long"
 msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
 
-#: ftparchive/apt-ftparchive.cc:368
+#: ftparchive/apt-ftparchive.cc:375
 msgid "Error writing header to contents file"
 msgstr "Chyba pri zapisovaní hlavičky do súboru"
 
-#: ftparchive/apt-ftparchive.cc:398
+#: ftparchive/apt-ftparchive.cc:405
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Chyba pri spracovávaní obsahu %s"
 
-#: ftparchive/apt-ftparchive.cc:553
+#: ftparchive/apt-ftparchive.cc:590
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -415,11 +426,11 @@ msgstr ""
 "  -c=?  Načíta tento konfiguračný súbor\n"
 "  -o=?  Nastaví ľubovoľnú voľbu"
 
-#: ftparchive/apt-ftparchive.cc:759
+#: ftparchive/apt-ftparchive.cc:796
 msgid "No selections matched"
 msgstr "Nevyhovel žiaden výber"
 
-#: ftparchive/apt-ftparchive.cc:832
+#: ftparchive/apt-ftparchive.cc:874
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
@@ -461,87 +472,87 @@ msgstr "Archív nemá riadiaci záznam"
 msgid "Unable to get a cursor"
 msgstr "Nedá sa získať kurzor"
 
-#: ftparchive/writer.cc:76
+#: ftparchive/writer.cc:73
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Adresár %s sa nedá čítať\n"
 
-#: ftparchive/writer.cc:81
+#: ftparchive/writer.cc:78
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: %s sa nedá vyhodnotiť\n"
 
-#: ftparchive/writer.cc:132
+#: ftparchive/writer.cc:134
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:136
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: Errors apply to file "
 msgstr "E: Chyby sa týkajú súboru "
 
-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Chyba pri preklade %s"
 
-#: ftparchive/writer.cc:170
+#: ftparchive/writer.cc:174
 msgid "Tree walking failed"
 msgstr "Prechod stromom zlyhal"
 
-#: ftparchive/writer.cc:195
+#: ftparchive/writer.cc:201
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s sa nedá otvoriť"
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:260
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Odlinkovanie %s [%s]\n"
 
-#: ftparchive/writer.cc:262
+#: ftparchive/writer.cc:268
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nie je možné vykonať readlink %s"
 
-#: ftparchive/writer.cc:266
+#: ftparchive/writer.cc:272
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nie je možné vykonať unlink %s"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nepodarilo sa zlinkovať %s s %s"
 
-#: ftparchive/writer.cc:283
+#: ftparchive/writer.cc:289
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
 
-#: ftparchive/writer.cc:389
+#: ftparchive/writer.cc:393
 msgid "Archive had no package field"
 msgstr "Archív neobsahuje pole „package“"
 
-#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemá žiadnu položku override\n"
 
-#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  správcom %s je %s, nie %s\n"
 
-#: ftparchive/writer.cc:638
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemá žiadnu položku „source override“\n"
 
-#: ftparchive/writer.cc:642
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -641,79 +652,79 @@ msgstr "Problém s odlinkovaním %s"
 msgid "Failed to rename %s to %s"
 msgstr "Premenovanie %s na %s zlyhalo"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba pri preklade regulárneho výrazu - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Nasledovné balíky majú nesplnené závislosti:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ale nainštalovaný je %s"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale inštalovať sa bude %s"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ale sa nedá nainštalovať"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ale je to virtuálny balík"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ale nie je nainštalovaný"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ale sa nebude inštalovať"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " alebo"
 
-#: cmdline/apt-get.cc:382
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
 
-#: cmdline/apt-get.cc:408
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Nasledovné balíky sa ODSTRÁNIA:"
 
-#: cmdline/apt-get.cc:430
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
 
-#: cmdline/apt-get.cc:451
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Nasledovné balíky sa aktualizujú:"
 
-#: cmdline/apt-get.cc:472
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nasledovné balíky sa DEGRADUJÚ:"
 
-#: cmdline/apt-get.cc:492
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Nasledovné pridržané balíky sa zmenia:"
 
-#: cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvôli %s) "
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -721,146 +732,235 @@ msgstr ""
 "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
 "Ak presne neviete, čo robíte, tak to NEROBTE!"
 
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
 
-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinštalovaných, "
 
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradovaných, "
 
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
 
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
 
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Zvolená verzia %s (%s) pre %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Nainštalovaný]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Kandidátske verzie"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
+"že balík chýba, bol zrušený alebo je dostupný iba z iného zdroja\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Avšak nahrádzajú ho nasledovné balíky:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Balík %s nemá kandidáta na inštaláciu"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Poznámka: %s sa vyberá namiesto %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s je už najnovšej verzie.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s je nastavený na manuálnu inštaláciu.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Opravujú sa závislosti..."
 
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " zlyhalo."
 
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Závislosti sa nedajú opraviť"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Sada na aktualizáciu sa nedá minimalizovať"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Hotovo"
 
-#: cmdline/apt-get.cc:684
-msgid "You might want to run `apt-get -f install' to correct these."
+#: cmdline/apt-get.cc:949
+#, fuzzy
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Opravu môžete spustiť pomocu „apt-get -f install“."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nesplnené závislosti. Skúste použiť -f."
 
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
 
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Nastali problémy a -y bolo použité bez --force-yes"
 
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
 
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
-msgid "Unable to lock the download directory"
-msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Nedá sa načítať zoznam zdrojov."
 
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages."
 "debian.org"
 
-#: cmdline/apt-get.cc:841
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB archívov.\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
 
-#: cmdline/apt-get.cc:852
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
 
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
 
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Na %s nemáte dostatok voľného miesta."
 
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
 
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Áno, urob to, čo vravím!"
 
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -871,28 +971,28 @@ msgstr ""
 "Ak chcete pokračovať, opíšte frázu „%s“\n"
 " ?]"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Prerušené."
 
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovať [Y/n]? "
 
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"
 
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -900,136 +1000,88 @@ msgstr ""
 "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
 "fix-missing"
 
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Chýbajúce balíky sa nedajú opraviť."
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Inštalácia sa prerušuje."
 
-#: cmdline/apt-get.cc:1086
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Poznámka: %s sa vyberá namiesto %s\n"
-
-#: cmdline/apt-get.cc:1097
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
-
-#: cmdline/apt-get.cc:1115
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
-
-#: cmdline/apt-get.cc:1126
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n"
-
-#: cmdline/apt-get.cc:1138
-msgid " [Installed]"
-msgstr " [Nainštalovaný]"
-
-#: cmdline/apt-get.cc:1143
-msgid "You should explicitly select one to install."
-msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
-
-#: cmdline/apt-get.cc:1148
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
+"The following package 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[2] ""
+
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
-"Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
-"že balík chýba, bol zrušený alebo je dostupný iba z iného zdroja\n"
-
-#: cmdline/apt-get.cc:1167
-msgid "However the following packages replace it:"
-msgstr "Avšak nahrádzajú ho nasledovné balíky:"
-
-#: cmdline/apt-get.cc:1170
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Balík %s nemá kandidáta na inštaláciu"
-
-#: cmdline/apt-get.cc:1190
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
-
-#: cmdline/apt-get.cc:1198
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s je už najnovšej verzie.\n"
-
-#: cmdline/apt-get.cc:1227
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
-
-#: cmdline/apt-get.cc:1229
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nebola nájdená verzia „%s“ pre „%s“"
 
-#: cmdline/apt-get.cc:1235
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Zvolená verzia %s (%s) pre %s\n"
-
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorovať nedostupné cieľové vydanie „%s“ balíka „%s“"
 
-#: cmdline/apt-get.cc:1352
+#: cmdline/apt-get.cc:1486
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 
-#: cmdline/apt-get.cc:1418
-msgid "Unable to lock the list directory"
-msgstr "Adresár zoznamov sa nedá zamknúť"
-
-#: cmdline/apt-get.cc:1474
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
 
-#: cmdline/apt-get.cc:1523
+#: 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:"
-msgstr ""
+msgstr[0] ""
+"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
+msgstr[1] ""
+"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
+msgstr[2] ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
-#: cmdline/apt-get.cc:1525
-#, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr ""
+#: cmdline/apt-get.cc:1657
+#, fuzzy, 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"
+msgstr[0] ""
+"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
+msgstr[1] ""
+"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
+msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Na ich odstránenie použite „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1531
+#: 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."
@@ -1047,43 +1099,24 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
 
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
 
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 
-#: cmdline/apt-get.cc:1612
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Nebolo možné nájsť úlohu %s"
-
-#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Balík %s sa nedá nájsť"
-
-#: cmdline/apt-get.cc:1750
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
-
-#: cmdline/apt-get.cc:1781
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s je nastavený na manuálnu inštaláciu.\n"
-
-#: cmdline/apt-get.cc:1794
-msgid "You might want to run `apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc:1779
+#, fuzzy
+msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:"
 
-#: cmdline/apt-get.cc:1797
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1091,7 +1124,7 @@ msgstr ""
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
-#: cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1103,124 +1136,153 @@ msgstr ""
 "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
 "Novoprichádzajúcich (Incoming) balíkov."
 
-#: cmdline/apt-get.cc:1827
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Balík %s sa nedá nájsť"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s je nastavený na manuálnu inštaláciu.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Prepočítava sa aktualizácia... "
 
-#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Chyba"
 
-#: cmdline/apt-get.cc:1983
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
 
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
+msgid "Unable to lock the download directory"
+msgstr "Adresár pre sťahovanie sa nedá zamknúť"
+
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
 
-#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nedá sa nájsť zdrojový balík pre %s"
 
-#: cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatok voľného miesta"
 
-#: cmdline/apt-get.cc:2278
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
 
-#: cmdline/apt-get.cc:2281
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
 
-#: cmdline/apt-get.cc:2287
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:2346
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
 
-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2395
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
 "zostavenie"
 
-#: cmdline/apt-get.cc:2439
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nedajú sa získať závislosti na zostavenie %s"
 
-#: cmdline/apt-get.cc:2459
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 
-#: cmdline/apt-get.cc:2511
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
 
-#: cmdline/apt-get.cc:2564
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1229,31 +1291,32 @@ msgstr ""
 "%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, "
 "ktorá zodpovedá požiadavke na verziu"
 
-#: cmdline/apt-get.cc:2600
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
 
-#: cmdline/apt-get.cc:2627
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:2643
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti na zostavenie %s sa nedajú splniť."
 
-#: cmdline/apt-get.cc:2648
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:2680
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:2721
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1277,6 +1340,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1337,7 +1402,7 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tento APT má schopnosti posvätnej kravy.\n"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1586,10 +1651,10 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
-#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
-#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
-#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nedá sa načítať %s"
@@ -1618,10 +1683,9 @@ msgstr "Vyhodnotenie %sinfo zlyhalo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
-#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
-#: apt-pkg/pkgcachegen.cc:1008
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Načítavajú sa zoznamy balíkov"
 
@@ -1724,12 +1788,12 @@ msgstr "Nedá sa nájsť platný riadiaci súbor"
 msgid "Unparsable control file"
 msgstr "Nespracovateľný riadiaci súbor"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:199
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Nedá sa čítať databáza na CD-ROM %s"
 
-#: methods/cdrom.cc:209
+#: methods/cdrom.cc:208
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
@@ -1737,7 +1801,7 @@ msgstr ""
 "Pre pridanie CD do APT použije apt-cdrom. apt-get update sa nedá využiť na "
 "pridávanie nových CD."
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:218
 msgid "Wrong CD-ROM"
 msgstr "Chybné CD"
 
@@ -1754,12 +1818,12 @@ msgstr "Disk sa nenašiel."
 msgid "File not found"
 msgstr "Súbor sa nenašiel"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Vyhodnotenie zlyhalo"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Zlyhalo nastavenie času zmeny"
 
@@ -1821,7 +1885,7 @@ msgstr "Uplynul čas spojenia"
 msgid "Server closed the connection"
 msgstr "Server ukončil spojenie"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Chyba pri čítaní"
 
@@ -1833,183 +1897,173 @@ msgstr "Odpoveď preplnila zásobník."
 msgid "Protocol corruption"
 msgstr "Narušenie protokolu"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Chyba pri zápise"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Nedá sa vytvoriť socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Nedá sa pripojiť pasívny socket."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal počúvajúci socket"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Nedá sa nadviazať socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Na sockete sa nedá počúvať"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Názov socketu sa nedá zistiť"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Príkaz PORT sa nedá odoslať"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznáma rodina adries %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Uplynulo spojenie dátového socketu"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Uplynula doba dátového socketu"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos dát zlyhal, server odpovedal „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Nedá sa vyvolať "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Pripája sa k %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
 
-#: methods/connect.cc:119
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nedá sa pripojiť k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:147 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pripája sa k %s"
 
-#: methods/connect.cc:166 methods/connect.cc:185
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nie je možné preložiť „%s“"
 
-#: methods/connect.cc:191
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Dočasné zlyhanie pri preklade „%s“"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:196
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
 
-#: methods/connect.cc:241
+#: methods/connect.cc:243
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nedá sa pripojiť k %s:%s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr "E: Príliš mnoho zväzkov kľúčov odovzdaných gpgv. Ukončuje sa."
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje "
-"sa."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Nedá sa spustiť „%s“ na kontrolu signatúry (je nainštalované gpgv?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Neznáma chyba pri spustení gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Nasledovné signatúry sú neplatné:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2017,16 +2071,6 @@ msgstr ""
 "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
 "kľúč:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Nedá sa otvoriť rúra pre %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Chyba pri čítaní z procesu %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavičky"
@@ -2060,60 +2104,75 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
-#: methods/http.cc:791
+#: methods/http.cc:793
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:796
+#: methods/http.cc:798
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
-#: methods/http.cc:819
+#: methods/http.cc:821
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#: methods/http.cc:850
+#: methods/http.cc:852
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:878
+#: methods/http.cc:880
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
-#: methods/http.cc:892
+#: methods/http.cc:894
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
-#: methods/http.cc:894
+#: methods/http.cc:896
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Nepodarilo sa skrátiť súbor"
 
-#: methods/http.cc:1150
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/http.cc:1167 methods/http.cc:1222
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/http.cc:1314
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:77
 msgid "Can't mmap an empty file"
 msgstr "Nedá sa vykonať mmap prázdneho súboru"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:89
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nedá sa otvoriť rúra pre %s"
+
+#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nedá sa urobiť mmap %lu bajtov"
 
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:124
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Nedá sa otvoriť %s"
+
+#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Nedá sa vyvolať "
+
+#: apt-pkg/contrib/mmap.cc:300
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2122,40 +2181,43 @@ msgstr ""
 "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
 "Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:347
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"Veľkosť MMap už dosiahla určený limit %lu bajtov, prerušuje sa pokus o "
-"zväčšenie MMap."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/contrib/strutl.cc:371
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%li d %li h %li min %li s"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%li h %li min %li s"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%limin %lis"
 msgstr "%li min %li s"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/contrib/strutl.cc:390
 #, c-format
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Voľba %s nenájdená"
@@ -2206,7 +2268,13 @@ msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
 
-#: apt-pkg/contrib/configuration.cc:825
+#: apt-pkg/contrib/configuration.cc:777
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
+
+#: apt-pkg/contrib/configuration.cc:827
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
@@ -2237,32 +2305,32 @@ msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
 msgid "Command line option %s is not boolean"
 msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Voľba %s vyžaduje argument."
 
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>."
 
-#: apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc:236
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“"
 
-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:267
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Voľba „%s“ je príliš dlhá"
 
-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:300
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
 
-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:350
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Neplatná operácia %s"
@@ -2272,191 +2340,213 @@ msgstr "Neplatná operácia %s"
 msgid "Unable to stat the mount point %s"
 msgstr "Prípojný bod %s sa nedá vyhodnotiť"
 
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
+#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nedá sa prejsť do %s"
 
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:204
 msgid "Failed to stat the cdrom"
 msgstr "Nedá sa vykonať stat() CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:151
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva"
 
-#: apt-pkg/contrib/fileutl.cc:156
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Súbor zámku %s sa nedá otvoriť"
 
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva"
 
-#: apt-pkg/contrib/fileutl.cc:178
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Zámok %s sa nedá získať"
 
-#: apt-pkg/contrib/fileutl.cc:568
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čakalo sa na %s, ale nebolo to tam"
 
-#: apt-pkg/contrib/fileutl.cc:580
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržal chybu segmentácie."
 
-#: apt-pkg/contrib/fileutl.cc:582
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s dostal signál %u."
 
-#: apt-pkg/contrib/fileutl.cc:586
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrátil chybový kód (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:588
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočakávane skončil"
 
-#: apt-pkg/contrib/fileutl.cc:632
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nedá sa otvoriť súbor %s"
 
-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nedá sa otvoriť súbor %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva"
 
-#: apt-pkg/contrib/fileutl.cc:718
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "zápis, stále treba zapísať %lu, no nedá sa to"
 
-#: apt-pkg/contrib/fileutl.cc:793
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problém pri zatváraní súboru"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Problém pri zatváraní súboru"
 
-#: apt-pkg/contrib/fileutl.cc:799
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problém pri synchronizovaní súboru"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problém pri odstraňovaní súboru"
 
-#: apt-pkg/contrib/fileutl.cc:810
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problém pri synchronizovaní súboru"
 
-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Vyrovnávacia pamäť balíkov je prázdna"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
 
-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie"
 
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tento APT nepodporuje systém na správu verzií „%s“"
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Predzávisí na"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Odporúča"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Nahrádza"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Zneplatňuje"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Kazí"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "Rozširuje"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "dôležitý"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "požadovaný"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "štandardný"
 
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "voliteľný"
 
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
 msgid "Building dependency tree"
 msgstr "Vytvára sa strom závislostí"
 
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:125
 msgid "Candidate versions"
 msgstr "Kandidátske verzie"
 
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:154
 msgid "Dependency generation"
 msgstr "Generovanie závislostí"
 
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
 msgid "Reading state information"
 msgstr "Načítavajú sa stavové informácie"
 
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:236
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nie je možné otvoriť StateFile %s"
 
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:242
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nie je možné zapísať dočasný StateFile %s"
 
+#: apt-pkg/depcache.cc:921
+#, c-format
+msgid "Internal error, group '%s' has no installable pseudo package"
+msgstr ""
+
 #: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
@@ -2467,57 +2557,77 @@ msgstr "Súbor %s sa nedá spracovať (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Súbor %s sa nedá spracovať (2)"
 
-#: apt-pkg/sourcelist.cc:83
+#: apt-pkg/sourcelist.cc:92
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
+
+#: apt-pkg/sourcelist.cc:95
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
+
+#: apt-pkg/sourcelist.cc:106
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
+
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
+
+#: apt-pkg/sourcelist.cc:115
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
+
+#: apt-pkg/sourcelist.cc:128
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
 
-#: apt-pkg/sourcelist.cc:85
+#: apt-pkg/sourcelist.cc:130
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
 
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:133
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
 
-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:139
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
 
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:146
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:244
 #, c-format
 msgid "Opening %s"
 msgstr "Otvára sa %s"
 
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
 
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:281
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
 
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
 
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)"
-
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2526,7 +2636,7 @@ msgstr ""
 "Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
 "man 5 apt.conf pod APT::Immediate-Configure (%d)"
 
-#: apt-pkg/packagemanager.cc:440
+#: apt-pkg/packagemanager.cc:452
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2537,7 +2647,7 @@ msgstr ""
 "kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
 "naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:478
+#: apt-pkg/packagemanager.cc:495
 #, c-format
 msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2551,13 +2661,13 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "Indexový súbor typu „%s“ nie je podporovaný"
 
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:292
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív."
 
-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1182
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2565,11 +2675,11 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
 "pridržanými balíkmi."
 
-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1184
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
 
-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2577,24 +2687,29 @@ msgstr ""
 "Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované alebo sa "
 "použili staršie verzie."
 
-#: apt-pkg/acquire.cc:60
-#, c-format
-msgid "Lists directory %spartial is missing."
+#: apt-pkg/acquire.cc:79
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
 msgstr "Adresár zoznamov %spartial chýba."
 
-#: apt-pkg/acquire.cc:64
-#, c-format
-msgid "Archive directory %spartial is missing."
+#: apt-pkg/acquire.cc:83
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
 msgstr "Archívny adresár %spartial chýba."
 
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Adresár zoznamov sa nedá zamknúť"
+
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:878
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
 
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:880
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Sťahuje sa %li. súbor z %li"
@@ -2614,12 +2729,12 @@ msgstr "Spôsob %s nebol správne spustený"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
 
-#: apt-pkg/init.cc:133
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Systém balíkov „%s“ nie je podporovaný"
 
-#: apt-pkg/init.cc:149
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nedá sa určiť vhodný typ systému balíkov"
 
@@ -2632,141 +2747,163 @@ msgstr "Nie je možné vykonať stat %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
 
-#: apt-pkg/policy.cc:316
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
 
-#: apt-pkg/policy.cc:338
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nezrozumiteľné pridržanie typu %s"
 
-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
 
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
 
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Chyba pri spracovávaní %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Chyba pri spracovávaní %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Chyba pri spracovávaní %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Chyba pri spracovávaní %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:226
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Chyba pri spracovávaní %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Chyba pri spracovávaní %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Chyba pri spracovávaní %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Vyskytla sa chyba pri spracovávaní %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Chyba pri spracovávaní %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
 
-#: apt-pkg/pkgcachegen.cc:706
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
 
-#: apt-pkg/pkgcachegen.cc:808
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "premenovanie zlyhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Nezhoda kontrolných MD5 súčtov"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Nezhoda kontrolných haš súčtov"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2775,7 +2912,7 @@ msgstr ""
 "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
 "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2784,37 +2921,47 @@ msgstr ""
 "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
 "manuálne."
 
-#: apt-pkg/acquire-item.cc:1360
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
 
-#: apt-pkg/acquire-item.cc:1447
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Veľkosti sa nezhodujú"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nedá spracovať súbor Release %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Žiadne sekcie v Release súbore %s"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Chýba položka Hash v súbore Release %s"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Chýba položka Hash v súbore Release %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Chýba položka Hash v súbore Release %s"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:518
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -2823,51 +2970,51 @@ msgstr ""
 "Použije sa CD-ROM prípojný bod %s\n"
 "Pripája sa CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
 msgid "Identifying.. "
 msgstr "Identifikuje sa.."
 
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:552
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Uložená menovka: %s \n"
 
-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM sa odpája...\n"
 
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:578
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Použije sa prípojný bod CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:596
 msgid "Unmounting CD-ROM\n"
 msgstr "CD-ROM sa odpája\n"
 
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:600
 msgid "Waiting for disc...\n"
 msgstr "Čaká sa na disk...\n"
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:608
 msgid "Mounting CD-ROM...\n"
 msgstr "Pripája sa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:626
 msgid "Scanning disc for index files..\n"
 msgstr "Na disku sa hľadajú indexové súbory..\n"
 
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov "
 "prekladov a %zu signatúr\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:677
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -2875,16 +3022,16 @@ msgstr ""
 "Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
 "alebo je pre nesprávnu architektúru?"
 
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:703
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Nájdená menovka: „%s“\n"
 
-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:732
 msgid "That is not a valid name, try again.\n"
 msgstr "Neplatný názov, skúste znova.\n"
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:748
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2893,154 +3040,198 @@ msgstr ""
 "Názov tohto disku je: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:752
 msgid "Copying package lists..."
 msgstr "Kopírujú sa zoznamy balíkov..."
 
-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:778
 msgid "Writing new source list\n"
 msgstr "Zapisuje sa nový zoznam zdrojov\n"
 
-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:787
 msgid "Source list entries for this disc are:\n"
 msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapísaných %i záznamov.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Preskakuje sa neexistujúci súbor %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Nezhoda kontrolných haš súčtov: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Inštaluje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, c-format
 msgid "Completely removing %s"
 msgstr "Úplne sa odstraňuje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Vykonáva sa spúšťač post-installation %s"
 
-#: apt-pkg/deb/dpkgpm.cc:558
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresár „%s“ chýba"
 
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Nedá sa otvoriť súbor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaľuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravuje sa nastavenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:662
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Nainštalovaný balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravuje sa odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:669
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Odstránený balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravuje sa úplné odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Balík „%s“ je úplne odstránený"
 
-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
 "pripojený?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:909
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "Spúšťa sa dpkg"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg bol prerušený, musíte ručne opraviť problém spustením „dpkg --configure "
 "-a“. "
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "Nie je zamknuté"
 
@@ -3062,10 +3253,43 @@ msgstr ""
 "Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba týkajúca "
 "sa mmap) - zdá sa, že záplata je poškodená."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Spojenie bolo predčasne ukončené"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Nebola nájdená verzia „%s“ pre „%s“"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Nebolo možné nájsť úlohu %s"
+
+#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+#~ msgstr "E: Príliš mnoho zväzkov kľúčov odovzdaných gpgv. Ukončuje sa."
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. "
+#~ "Ukončuje sa."
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Chyba pri čítaní z procesu %s"
+
+#~ msgid ""
+#~ "The size of a MMap has already reached the defined limit of %lu bytes,"
+#~ "abort the try to grow the MMap."
+#~ msgstr ""
+#~ "Veľkosť MMap už dosiahla určený limit %lu bajtov, prerušuje sa pokus o "
+#~ "zväčšenie MMap."
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Chyba pri spracovávaní %s (NewVersion2)"
+
 #~ msgid "Couldn't access keyring: '%s'"
 #~ msgstr "Zväzok kľúčov „%s“ je nedostupný."
 
diff --git a/po/sl.po b/po/sl.po
index f4de66b4e..c14f439ca 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,157 +4,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2005-02-16 22:18+0100\n"
 "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s razlièica %s ima nere¹ene odvisnosti:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ne najdem paketa %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Vseh imen paketov:"
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Vseh imen paketov:"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr " Navadni paketi:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr " Èisti navidezni paketi:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr " Posamezni navidezni paketi:"
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr " Me¹ani navidezni paketi:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr " Manjka: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Vseh razlièic:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Vseh razlièic:"
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Vseh odvisnosti:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Vseh povezava Raz/Dat:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Vseh povezava Raz/Dat:"
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Vseh dobljenih preslikav: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Vseh raz¹irjenih nizov: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Celotna velikost z odvisnostmi: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Celotna ohlapna velikost: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Celotna velikost, izraèunana za: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketna datoteka %s ni usklajena."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Podati morate natanèno en vzorec"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Nobena datoteka ni bila najdena"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ne najdem paketa %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Paketne datoteke:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Predpomnilnik ni usklajen, x-ref paketne datotek ni mogoè"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Pripeti paketi:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(ni najden)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Name¹èen: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr " Kandidat:"
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(brez)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr " Zaponka paketa:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr " Tabela razlièic:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s za %s %s preveden na %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -176,6 +176,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -311,12 +312,12 @@ msgstr ""
 "  -c=? Prebere podano datoteko z nastavitvami\n"
 "  -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni mogoèe pisati na %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni mogoèe ugotoviti razlièice debconfa. Je sploh name¹èen?"
 
@@ -649,79 +650,79 @@ msgstr "Napaka pri odvezovanju %s"
 msgid "Failed to rename %s to %s"
 msgstr "Ni mogoèe preimenovati %s v %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Napaka pri prevajanju regex - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Naslednji paketi imajo nere¹ene odvisnosti:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "vendar je paket %s name¹èen"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "vendar bo paket %s name¹èen"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "vendar se ga ne da namestiti"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "vendar je navidezen paket"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "vendar ni name¹èen"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "vendar ne bo name¹èen"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " ali"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Naslednji NOVI paketi bodo name¹èeni:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Naslednji paketi so bili zadr¾ani:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Naslednji paketi bodo nadgrajeni:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Naslednji paketi bodo POSTARANI:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Naslednji zadr¾ani paketi bodo spremenjeni:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (zaradi %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -730,141 +731,234 @@ msgstr ""
 "OPOZORILO: Naslednji kljuèni paketi bodo odstranjeni.\n"
 "To NI priporoèljivo, razen èe natanèno veste, kaj poènete."
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu nadgrajenih, %lu na novo name¹èenih, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu posodobljenih, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu postaranih, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ne popolnoma name¹èenih ali odstranjenih.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Opomba: izbran %s namesto regex '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Opomba: izbran %s namesto regex '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Izbrana razlièica %s (%s) za %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Paket %s je navidezen in ga je priskrbel:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Name¹èeno]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Razlièice kandidatov"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Sami izberite paket, ki ga ¾elite namestiti."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Paket %s nima navedene razlièice, vendar se nek drug paket nana¹a nanj.\n"
+"To ponavadi pomeni, da paket manjka, je zastaran ali\n"
+"pa je na voljo samo iz drugega vira.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Paket %s nima kandidata za namestitev"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Opomba: izbran %s namesto %s \n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Ponovna namestitev %s ni mo¾na, ker ni mo¾en prenos.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Najnovej¹a razlièica %s je ¾e name¹èena.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "vendar bo paket %s name¹èen"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Paket %s ni name¹èen, zato ni odstranjen\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Popravljanje odvisnosti ..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " spodletelo."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Ni mogoèe popraviti odvisnosti"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni mogoèe pomanj¹ati zbirke za nadgradnjo"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Opravljeno"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Èe ¾elite popraviti napake, poskusite pognati 'apt-get -f install'."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nere¹ene odvisnosti. Poskusite uporabiti -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "POZORO: Naslednjih paketov ni bilo mogoèe avtenticirati!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Namestim te pakete brez prevejanje [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Nisem uspel avtenticirati nekaterih paketkov"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Pri¹lo je do te¾av in -y je bil uporabljen brez --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Notranja napaka pri dodajanju odklona"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Seznama virov ni mogoèe brati."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potrebno je dobiti %sB arhivov.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "V %s je premalo prostora."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Izbrana je mo¾nost Samo preprosto, a to opravilo ni preprosto."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Da, naredi tako kot pravim!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -875,28 +969,28 @@ msgstr ""
 "Za nadaljevanje vnesite frazo '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Prekini."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ali ¾elite nadaljevati [Y/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogoèe dobiti %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Prenos nekaterih datotek ni uspel"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Prenos dokonèan in uporabljen naèin samo prenos"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -904,126 +998,57 @@ msgstr ""
 "Nekaterih arhivov ni mogoèe dobiti. Poskusite uporabiti apt-get update ali --"
 "fix-missing."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Ni mogoèe popraviti manjkajoèih paketov."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Prekinjanje namestitve."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Opomba: izbran %s namesto %s \n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Paket %s ni name¹èen, zato ni odstranjen\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Paket %s je navidezen in ga je priskrbel:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Name¹èeno]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Razlièice kandidatov"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Sami izberite paket, ki ga ¾elite namestiti."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Paket %s nima navedene razlièice, vendar se nek drug paket nana¹a nanj.\n"
-"To ponavadi pomeni, da paket manjka, je zastaran ali\n"
-"pa je na voljo samo iz drugega vira.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Paket %s nima kandidata za namestitev"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ponovna namestitev %s ni mo¾na, ker ni mo¾en prenos.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Najnovej¹a razlièica %s je ¾e name¹èena.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Izdaje '%s' za '%s' ni mogoèe najti"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Razlièice '%s' za '%s' ni mogoèe najti"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Izbrana razlièica %s (%s) za %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne potrebuje argumentov"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1033,7 +1058,7 @@ msgid_plural ""
 msgstr[0] "Naslednji NOVI paketi bodo name¹èeni:"
 msgstr[1] "Naslednji NOVI paketi bodo name¹èeni:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1041,11 +1066,11 @@ msgid_plural ""
 msgstr[0] "Naslednji NOVI paketi bodo name¹èeni:"
 msgstr[1] "Naslednji NOVI paketi bodo name¹èeni:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1061,44 +1086,24 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Ni mogoèe najti paketa %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Ni mogoèe najti paketa %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Opomba: izbran %s namesto regex '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "vendar bo paket %s name¹èen"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1106,7 +1111,7 @@ msgstr ""
 "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "podajte re¹itev)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1117,130 +1122,155 @@ msgstr ""
 "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani "
 "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo name¹èeni:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Priporoèeni paketi:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Ni mogoèe najti paketa %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "vendar bo paket %s name¹èen"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Preraèunavanje nadgradnje ... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Spodletelo"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Opravljeno"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Ni mogoèe zakleniti imenika za prenose"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogoèe najti"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogoèe dobiti."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Otro¹ki proces ni uspel"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti "
 "za gradnjo"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1249,31 +1279,31 @@ msgstr ""
 "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne "
 "more zadostiti zahtevi po razlièici"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo ni uspela"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1298,6 +1328,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1356,7 +1388,7 @@ msgstr ""
 "sources.list(5) in apt.conf(5).\n"
 "                       APT ima moè Super Krave.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1605,9 +1637,9 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni mogoèe brati %s"
@@ -1636,10 +1668,9 @@ msgstr "Dolo
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Podatki in zaèasni imeniki morajo biti v istem datoteènem sistemu"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Branje seznama paketov"
 
@@ -1772,12 +1803,12 @@ msgstr "Datoteke ni mogo
 msgid "File not found"
 msgstr "Datoteke ni mogoèe najti"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Doloèitev ni uspela"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Nastavitev èasa spremembe ni uspela"
 
@@ -1839,7 +1870,7 @@ msgstr "Povezava potekla"
 msgid "Server closed the connection"
 msgstr "Stre¾nik je zaprl povezavo"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Napaka pri branju"
 
@@ -1851,197 +1882,178 @@ msgstr "Odgovor je prekora
 msgid "Protocol corruption"
 msgstr "Okvara protokola"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Ni mogoèe ustvariti vtiènice"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Ni mogoèe priklopiti podatkovne vtiènice. Povezava potekla."
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Ni mogoèe priklopiti pasivne vtiènice."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ni mogel dobiti poslu¹ajoèe vtiènice"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Ni mogoèe povezati vtiènice"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Ni mogoèe poslu¹ati na vtiènici"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Ni mogoèe ugotoviti imena vtiènice"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Ni mogoèe poslati ukaza PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznan naslov dru¾ine %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ni uspel, stre¾nik je odgovoril: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Povezava podatkovne vtiènice potekla"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Ni mogoèe sprejeti povezave"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Te¾ava pri razpr¹evanju datoteke"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ni mogoèe dobiti datoteke, stre¾nik je odgovoril '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Podatkovna vtiènica je potekla"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos podatkov ni uspel, stre¾nik je odgovoril '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Poizvedba"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Ni mogoèe zagnati "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Povezovanje z %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Ni mogoèe ustvariti vtiènice za %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni mogoèe zaèeti povezave z %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Ni se mogoèe povezati z %s:%s (%s). Povezava potekla."
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ni se mogoèe povezati z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se z %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ni mogoèe razre¹iti '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Zaèasna napaka pri razre¹evanju '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Pri¹lo je do napake pri razre¹evanju '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ni se mogoèe povezati z %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Prekinjanje namestitve."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji dodatni paketi bodo name¹èeni:"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Ni mogoèe odprti %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Napaka pri branju iz procesa %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Èakanje na glave"
@@ -2103,20 +2115,20 @@ msgstr "Napaka pri branju oddaljene in zaprte povezave s stre
 msgid "Error reading from server"
 msgstr "Napaka pri branju s stre¾nika"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Napaka pri pisanju datoteke %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Napaèni podatki glave"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Notranja napaka"
 
@@ -2151,11 +2163,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2182,7 +2199,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Izbira %s ni mogoèe najti"
@@ -2315,152 +2332,169 @@ msgstr "Ni mogo
 msgid "Failed to stat the cdrom"
 msgstr "Ni mogoèe doloèiti CD-ROM-a"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ni mogoèe odprti zaklenjene datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ni mogoèe dobiti zaklenjene datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Èakal, a %s ni bil tam"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Napaka pri razèlenjenosti podprocesa %s."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Napaka pri razèlenjenosti podprocesa %s."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s je vrnil kodo napake (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s se je neprièakovano zakljuèil"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Ne morem odpreti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ni mogoèe odprti %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "berem, ¹e vedno %lu za branje, a nobeden ostal"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "pi¹em, ¹e vedno %lu za pisanje, a ni mogoèe"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Te¾ava pri zapiranju datoteke"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Te¾ava pri zapiranju datoteke"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Te¾ava pri usklajevanju datoteke"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Te¾ava pri odvezovanju datoteke"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Te¾ava pri usklajevanju datoteke"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Prazen predpomnilnik paketov"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Razlièica datoteke s predpomnilnikom paketov ni ustrezna"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ta APT ne podpira sistema razlièic '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Predpomnilnik paketov je bil zgrajen za drugaèno arhitekturo"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Odvisen od"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Predodvisnost"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Priporoèa"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Priporoèa"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Zamenja"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Zastarani"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "pomembno"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "obvezno"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "izbirno"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "dodatno"
 
@@ -2491,7 +2525,7 @@ msgstr "Ni mogo
 msgid "Failed to write temporary StateFile %s"
 msgstr "Napaka pri pisanju datoteke %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2576,7 +2610,7 @@ msgstr "Napa
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2625,7 +2659,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ni mogoèe popraviti te¾av. Imate zadr¾ane pakete."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2678,12 +2712,12 @@ msgstr ""
 " '%s'\n"
 "v enoto '%s' in pritisnite enter\n"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketni sistem '%s' ni podprt"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema"
 
@@ -2696,141 +2730,163 @@ msgstr "Ni mogo
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "V sources.list morate vstaviti URI-je z viri"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Ni mogoèe odprti ali razèleniti seznama paketov ali datoteke stanja."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Èe ¾elite odpraviti te¾ave, poskusite zagnati apt-get update."
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Napaèen zapis v datoteki z nastavitvami. Ni glave paketa"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Ni mogoèe razumeti vrste zaponke %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Prioriteta zaponke ni doloèena ali pa je niè."
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Predpomnilnik ima neustrezen sistem razlièic"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Nov paket)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Uau, presegli ste ¹tevilo imen paketov, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Uau, presegli ste ¹tevilo odvisnosti, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Pri¹lo je do napake pri obdelavi %s  (Najdi paket)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Pri¹lo je do napake pri obdelavi %s (Zberi dobavitelje datotek)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Paketa %s %s ni bilo mogoèe najti med obdelavo odvisnosti"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Zbiranje dobaviteljev datotek"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "preimenovanje spodletelo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Neujemanje vsote MD5"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Neujemanje vsote MD5"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2839,7 +2895,7 @@ msgstr ""
 "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
 "popraviti ta paket (zaradi manjkajoèega arhiva)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2848,7 +2904,7 @@ msgstr ""
 "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
 "popraviti ta paket."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2856,25 +2912,35 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
 "%s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Neujemanje velikosti"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ni mogoèe razèleniti paketne datoteke %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Opomba: izbran %s namesto %s \n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Napaèna vrstica v datoteki z odklonom: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni mogoèe razèleniti paketne datoteke %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2928,8 +2994,8 @@ msgstr "Preverjam medij za datoteke s kazalom..\n"
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr "Na¹el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n"
 
 #: apt-pkg/cdrom.cc:677
@@ -2968,145 +3034,184 @@ msgstr "Pi
 msgid "Source list entries for this disc are:\n"
 msgstr "Izvorni vnosi za ta medij so:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisal %i zapisov.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapisal %i zapisov z %i manjkajoèimi datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapisal %i zapisov z %i neujemajoèimi datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Zapisal %i zapisov z %i manjkajoèimi datotekami in %i neujemajoèimi "
 "datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Neujemanje vsote MD5"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Name¹èen: "
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se z %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Odpiram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Odstranitev %s ni uspela"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Manjka imenik s seznami %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Ne morem odpreti datoteke %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Odpiram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Odpiram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Name¹èen: "
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Priporoèa"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Odstranitev %s ni uspela"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Imenika seznamov ni mogoèe zakleniti"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3124,10 +3229,29 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Povezava se je prezgodaj zaprla"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Izdaje '%s' za '%s' ni mogoèe najti"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Razlièice '%s' za '%s' ni mogoèe najti"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Ni mogoèe najti paketa %s"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Ni mogoèe odprti %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Napaka pri branju iz procesa %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Napaèna vrstica %u v seznamu virov %s (ID ponudnika)"
 
@@ -3180,8 +3304,8 @@ msgstr "Povezava se je prezgodaj zaprla"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Na¹el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n"
 
diff --git a/po/sv.po b/po/sv.po
index d0178c233..c599eff89 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,156 +7,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-03-03 23:15+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 "Paketet %s med versionen %s har ett beroende som inte kan tillfredsställas:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kunde inte hitta paketet %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Totalt antal paketnamn: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Totalt antal paketnamn: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normala paket: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuella paket: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Enstaka virtuella paket: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Blandade virtuella paket: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Saknade: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Totalt antal olika versioner: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Totalt antal olika beskrivningar: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Totalt antal beroenden: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Totalt antal version/filrelationer: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Totalt antal beskrivning/filrelationer: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Totalt antal tillhandahållningsmarkeringar: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Totalt antal sökmönstersträngar: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Totalt utrymme för versionsberoenden: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Totalt bortkastat utrymme: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Totalt utrymme som kan redogöras för: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketfilen %s är inte synkroniserad."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Du måste ange exakt ett mönster"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Inga paket hittades"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kunde inte hitta paketet %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Fastnålade paket:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(hittades inte)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Paketnålning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s för %s kompilerad den %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -177,6 +178,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -309,12 +311,12 @@ msgstr ""
 "  -c=? Läs denna konfigurationsfil.\n"
 "  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kunde inte skriva till %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
 
@@ -655,79 +657,79 @@ msgstr "Problem med att länka ut %s"
 msgid "Failed to rename %s to %s"
 msgstr "Misslyckades med att byta namn på %s till %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fel vid kompilering av reguljärt uttryck - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s är installerat"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s kommer att installeras"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "men det kan inte installeras"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "men det är ett virtuellt paket"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "men det är inte installerat"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "men det kommer inte att installeras"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Följande NYA paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Följande paket kommer att TAS BORT:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Följande paket har hållits tillbaka:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Följande paket kommer att uppgraderas:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Följande paket kommer att NEDGRADERAS:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Följande tillbakahållna paket kommer att ändras:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (på grund av %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -735,144 +737,239 @@ msgstr ""
 "VARNING: Följande systemkritiska paket kommer att tas bort.\n"
 "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu att uppgradera, %lu att nyinstallera, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu att installera om, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu att nedgradera, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu är inte helt installerade eller borttagna.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vald version %s (%s) för %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installerat]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Kandiderande versioner"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Du bör uttryckligen ange ett att installera."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Paketet %s är inte tillgängligt, men ett annat paket hänvisar till det.\n"
+"Det kan betyda att paketet saknas, har blivit föråldrat eller endast\n"
+"är tillgängligt från andra källor\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Dock kan följande paket ersätta det:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Paketet %s har ingen installationskandidat"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Observera, väljer %s istället för %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s är redan den senaste versionen.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s är satt till manuellt installerad.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Korrigerar beroenden...."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " misslyckades."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Kunde inte korrigera beroenden"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunde inte minimera uppgraderingsuppsättningen"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Färdig"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Du kan möjligen rätta till dessa genom att köra \"apt-get -f install\"."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Otillfredsställda beroenden. Prova med -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VARNING: Följande paket kunde inte autentiseras!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsvarning åsidosatt.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installera dessa paket utan verifiering [j/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "NÃ¥gra av paketen kunde inte autentiseras"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Problem har uppstått och -y användes utan --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internt fel. Sorteringen färdigställdes inte"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Listan över källor kunde inte läsas."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Konstigt.. storlekarna stämde inte överens, skicka e-post till apt@packages."
 "debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Behöver hämta %sB/%sB arkiv.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Behöver hämta %sB arkiv.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Efter denna åtgärd kommer ytterligare %sB utrymme användas på disken.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte fastställa ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Ja, gör som jag säger!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -884,28 +981,28 @@ msgstr ""
 " ?] "
 
 # Visas då man svarar nej
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Avbryter."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vill du fortsätta [J/n]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hämta %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -913,129 +1010,58 @@ msgstr ""
 "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
 "fix-missing."
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing och mediabyte stöds inte för tillfället"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Kunde inte korrigera saknade paket."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Avbryter installationen."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Observera, väljer %s istället för %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Installerat]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Kandiderande versioner"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Du bör uttryckligen ange ett att installera."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Paketet %s är inte tillgängligt, men ett annat paket hänvisar till det.\n"
-"Det kan betyda att paketet saknas, har blivit föråldrat eller endast\n"
-"är tillgängligt från andra källor\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Dock kan följande paket ersätta det:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Paketet %s har ingen installationskandidat"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s är redan den senaste versionen.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version \"%s\" för \"%s\" hittades inte"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Vald version %s (%s) för %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Kunde inte ta status på källkodspaketlistan %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1047,7 +1073,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1057,11 +1083,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1079,44 +1105,24 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Följande information kan vara till hjälp för att lösa situationen:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internt fel, AutoRemover förstörde något"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internt fel, AllUpgrade förstörde något"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Kunde inte hitta funktionen %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Kunde inte hitta paketet %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s är satt till manuellt installerad.\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1124,7 +1130,7 @@ msgstr ""
 "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lösning)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1136,119 +1142,144 @@ msgstr ""
 "att några nödvändiga paket ännu inte har skapats eller flyttats\n"
 "ut från \"Incoming\"."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Följande ytterligare paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Föreslagna paket:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Kunde inte hitta paketet %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s är satt till manuellt installerad.\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Beräknar uppgradering... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Färdig"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlösaren förstörde någonting"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte låsa hämtningskatalogen"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du måste ange minst ett paket att hämta källkod för"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta något källkodspaket för %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Behöver hämta %sB källkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hämtar källkoden %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Packar inte upp redan uppackad källkod i %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunde inte hämta information om byggberoenden för %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1257,7 +1288,7 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1266,32 +1297,32 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
 "versioner av paketet %s tillfredsställer versionskraven"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
 "paketet %s är för nytt"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1316,6 +1347,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1375,7 +1408,7 @@ msgstr ""
 "för mer information och flaggor.\n"
 "                     Denna APT har Speciella Ko-Krafter.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1629,9 +1662,9 @@ msgstr "Filen %s/%s skriver över den i paketet %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunde inte läsa %s"
@@ -1660,10 +1693,9 @@ msgstr "Misslyckades att ta status på %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Katalogerna info och temp måste vara på samma filsystem"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Läser paketlistor"
 
@@ -1797,12 +1829,12 @@ msgstr "Skivan hittades inte."
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Kunde inte ta status"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Misslyckades ställa in ändringstid"
 
@@ -1864,7 +1896,7 @@ msgstr "Tidsgränsen för anslutningen överskreds"
 msgid "Server closed the connection"
 msgstr "Servern stängde anslutningen"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Läsfel"
 
@@ -1876,188 +1908,180 @@ msgstr "Ett svar spillde bufferten."
 msgid "Protocol corruption"
 msgstr "Protokollet skadat"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivfel"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Kunde inte skapa ett uttag (socket)"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Kunde inte ansluta passivt uttag (socket)."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Kunde inte binda ett uttag (socket)"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Kunde inte lyssna på uttaget (socket)"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Kunde inte fastställa uttagets namn (socket)"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Kunde inte sända PORT-kommando"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Okänd adressfamilj %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunde inte hämta filen, servern sade \"%s\""
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataöverföringen misslyckades, servern sade \"%s\""
 
 # Statusmeddelande, byter från substantiv till verb
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Frågar"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Kunde inte starta "
 
 # Felmeddelande för misslyckad chdir
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 # [f]amilj, [t]yp, [p]rotokoll
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Kunde inte skapa ett uttag (socket) för %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kunde inte initiera anslutningen till %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunde inte ansluta till %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ansluter till %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunde inte slå upp \"%s\""
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporärt fel vid uppslagning av \"%s\""
 
 # Okänd felkod; %i = koden
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunde inte ansluta till %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Avbryter installationen."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
 "fingeravtryck?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur träffades på."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Okänt fel vid körning av gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Följande signaturer är ogiltiga:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2065,17 +2089,6 @@ msgstr ""
 "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är "
 "tillgänglig:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Kunde inte öppna rör för %s"
-
-# %s = programnamn
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Läsfel från %s-processen"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Väntar på rubriker"
@@ -2137,19 +2150,19 @@ msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Misslyckades med att kapa av filen"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Internt fel"
 
@@ -2186,11 +2199,16 @@ msgstr ""
 "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
 "Aktuellt värde: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2217,7 +2235,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valet %s hittades inte"
@@ -2350,155 +2368,172 @@ msgstr "Kunde inte byta till %s"
 msgid "Failed to stat the cdrom"
 msgstr "Kunde inte ta status på cd-romen."
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Använder inte låsning för skrivskyddade låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunde inte öppna låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Använder inte låsning för nfs-monterade låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunde inte erhålla låset %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Väntade på %s men den fanns inte där"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s svarade med en felkod (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s avslutades oväntat"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunde inte öppna filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Kunde inte öppna rör för %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem med att stänga filen"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Problem med att stänga filen"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem med att synkronisera filen"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problem med att länka ut filen"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problem med att synkronisera filen"
 
 # Felmeddelande
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Paketcachen är tom"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Paketcachefilen är skadad"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Paketcachefilens version är inkompatibel"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denna APT saknar stöd för versionssystemet \"%s\""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Paketcachen byggdes för en annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Beroende av"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Förberoende av"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Föreslår"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Rekommenderar"
 
 # "Konfliktar"?
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Står i konflikt med"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Ersätter"
 
 # "Föråldrar"?
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Föråldrar"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Trasar sönder"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "viktigt"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "nödvändigt"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "normalt"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2528,7 +2563,7 @@ msgstr "Misslyckades med att öppna StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Misslyckades med att skriva temporär StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2613,7 +2648,7 @@ msgstr "Rad %u i källistan %s har fel format (typ)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2663,7 +2698,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kunde inte korrigera problemen, du har hållt tillbaka trasiga paket."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2714,13 +2749,13 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck på Enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketsystemet \"%s\" stöds inte"
 
 #
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
 
@@ -2733,143 +2768,165 @@ msgstr "Kunde inte ta status på %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du måste lägga till några \"source\"-URI:er i din sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\""
 
 # "Package" är en sträng i konfigurationsfilen
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Förstod inte nåltypen %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Prioritet ej angiven (eller noll) för nål"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Cachen har ett inkompatibelt versionssystem"
 
 # NewPackage etc. är funktionsnamn
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Fel uppstod vid hantering av %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Fel uppstod vid hantering av %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Fel uppstod vid hantering av %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Fel uppstod vid hantering av %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
 
 # NewPackage etc. är funktionsnamn
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Fel uppstod vid hantering av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunde inte ta status på källkodspaketlistan %s"
 
 # Bättre ord?
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Samlar filtillhandahållningar"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "In-/utfel vid lagring av källcache"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "namnbyte misslyckades, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5-kontrollsumman stämmer inte"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash-kontrollsumman stämmer inte"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2878,7 +2935,7 @@ msgstr ""
 "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
 "manuellt måste reparera detta paket (på grund av saknad arkitektur)."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2887,31 +2944,41 @@ msgstr ""
 "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
 "manuellt måste reparera detta paket."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Storleken stämmer inte"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kunde inte tolka paketfilen %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Observera, väljer %s istället för %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Felaktig rad i omdirigeringsfilen: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Kunde inte tolka paketfilen %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2964,8 +3031,8 @@ msgstr "Söker efter indexfiler på skivan...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu "
 "signaturer\n"
@@ -3006,144 +3073,183 @@ msgstr "Skriver ny källista\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Poster i källistan för denna skiva:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i saknade filer.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i filer som inte stämmer\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Öppnar konfigurationsfilen %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash-kontrollsumman stämmer inte"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Installerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kör efterinstallationsutlösare %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Katalogen \"%s\" saknas"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunde inte öppna filen %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Förbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Packar upp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Förbereder konfigurering av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Installerade %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Förbereder borttagning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Tog bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Förbereder borttagning av hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kunde inte låsa listkatalogen"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3161,10 +3267,33 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Anslutningen stängdes i förtid"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Version \"%s\" för \"%s\" hittades inte"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Kunde inte hitta funktionen %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Kunde inte öppna rör för %s"
+
+# %s = programnamn
+#~ msgid "Read error from %s process"
+#~ msgstr "Läsfel från %s-processen"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Rad %u i källistan %s har fel format (leverantörs-id)"
 
diff --git a/po/th.po b/po/th.po
index 19deb06c5..560e81d3a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,155 +8,155 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-11-06 15:54+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "ไม่พบแพกเกจ %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "จำนวนชื่อแพกเกจทั้งหมด : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "จำนวนชื่อแพกเกจทั้งหมด : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  แพกเกจปกติ: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  แพกเกจเสมือนแท้ๆ: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  แพกเกจเสมือนที่มีแพกเกจจริงเดียว: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  แพกเกจเสมือนผสม: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  แพกเกจที่ขาดหาย: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "จำนวนผังการตระเตรียมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "จำนวนสตริงทั้งหมด: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "พื้นที่สำรองทั้งหมด: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "พื้นที่ที่นับรวมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "คุณต้องระบุแพตเทิร์นด้วย"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "ไม่พบแพกเกจ"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "ไม่พบแพกเกจ %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "แฟ้มแพกเกจ:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "แพกเกจที่ถูกตรึง:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(ไม่พบ)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  ที่ติดตั้งอยู่: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  รุ่นที่ติดตั้งได้: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  การตรึงแพกเกจ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -178,6 +178,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -310,12 +311,12 @@ msgstr ""
 "  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
 "  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
 
@@ -645,79 +646,79 @@ msgstr "มีปัญหาขณะลบแฟ้ม %s"
 msgid "Failed to rename %s to %s"
 msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "แต่ไม่สามารถติดตั้งได้"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "แต่ได้ติดตั้งไว้"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " หรือ"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (เนื่องจาก %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -725,140 +726,232 @@ msgstr ""
 "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
 "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ปรับรุ่นลง %lu, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [ติดตั้งอยู่]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "รุ่นแพกเกจที่มี"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง"
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n"
+"แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "แพกเกจ %s ไม่มีรุ่นที่จะใช้ติดตั้ง"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " ล้มเหลว"
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " เสร็จแล้ว"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่ [y/N]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "แปลกประหลาด.. ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "ต้องดาวน์โหลดแพกเกจ %sB\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %sB\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -869,28 +962,28 @@ msgstr ""
 "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "เลิกทำ"
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -898,125 +991,57 @@ msgstr ""
 "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-"
 "missing อาจช่วยได้"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "จะล้มเลิกการติดตั้ง"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [ติดตั้งอยู่]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "รุ่นแพกเกจที่มี"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง"
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n"
-"แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "แพกเกจ %s ไม่มีรุ่นที่จะใช้ติดตั้ง"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "ไม่พบรุ่น '%s' ของ '%s'"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1026,7 +1051,7 @@ msgid_plural ""
 msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 msgstr[1] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1034,11 +1059,11 @@ msgid_plural ""
 msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 msgstr[1] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1056,43 +1081,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "ไม่พบงาน %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "ไม่พบแพกเกจ %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1100,7 +1105,7 @@ msgstr ""
 "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
 "(หรือจะระบุทางแก้ก็ได้)"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1111,126 +1116,151 @@ msgstr ""
 "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
 "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "แพกเกจมีปัญหา"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "แพกเกจที่แนะนำ:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "ไม่พบแพกเกจ %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "กำลังคำนวณการปรับรุ่น... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "ล้มเหลว"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "เสร็จแล้ว"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ดาวน์โหลดซอร์ส %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "โพรเซสลูกล้มเหลว"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,30 +1269,30 @@ msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
 "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1287,6 +1317,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1346,7 +1378,7 @@ msgstr ""
 "และ apt.conf(5)\n"
 "                       APT นี้มีพลังของ Super Cow\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1592,9 +1624,9 @@ msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพก
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
@@ -1623,10 +1655,9 @@ msgstr "ไม่สามารถ stat %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "กำลังอ่านรายชื่อแพกเกจ"
 
@@ -1757,12 +1788,12 @@ msgstr "ไม่พบแผ่น"
 msgid "File not found"
 msgstr "ไม่พบแฟ้ม"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "stat ไม่สำเร็จ"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
 
@@ -1822,7 +1853,7 @@ msgstr "หมดเวลารอเชื่อมต่อ"
 msgid "Server closed the connection"
 msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "การอ่านข้อมูลผิดพลาด"
 
@@ -1834,196 +1865,178 @@ msgstr "คำตอบท่วมบัฟเฟอร์"
 msgid "Protocol corruption"
 msgstr "มีความเสียหายของโพรโทคอล"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "การเขียนข้อมูลผิดพลาด"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "ไม่สามารถสร้างซ็อกเก็ต"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "ไม่สามารถ bind ซ็อกเก็ต"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "ไม่สามารถส่งคำสั่ง PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "สอบถาม"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "ไม่สามารถเรียก "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "เชื่อมต่อไปยัง %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "ไม่สามารถสร้างซ็อกเก็ตสำหรับ %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "เชื่อมต่อไปยัง %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "จะล้มเลิกการติดตั้ง"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "รอหัวข้อมูล"
@@ -2085,19 +2098,19 @@ msgstr "เกิดข้อผิดพลาดขณะอ่านข้อ
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "ไม่สามารถตัดท้ายแฟ้ม"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
@@ -2132,11 +2145,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2163,7 +2181,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "ไม่พบรายการเลือก %s"
@@ -2294,152 +2312,169 @@ msgstr "ไม่สามารถเปลี่ยนไดเรกทอร
 msgid "Failed to stat the cdrom"
 msgstr "ไม่สามารถ stat ซีดีรอม"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ไม่สามารถเปิดแฟ้มล็อค %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ไม่สามารถล็อค %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "ไม่สามารถเปิดแฟ้ม %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "เกิดปัญหาขณะปิดแฟ้ม"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "เกิดปัญหาขณะปิดแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "เกิดปัญหาขณะ sync แฟ้ม"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "เกิดปัญหาขณะลบแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "เกิดปัญหาขณะ sync แฟ้ม"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "แคชของแพกเกจว่างเปล่า"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "ต้องใช้"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "ต้องใช้ขณะติดตั้ง"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "แนะนำ"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "ควรใช้ร่วมกับ"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "ขัดแย้งกับ"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "แทนที่"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "ใช้แทน"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "ทำให้พัง"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "สำคัญ"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "จำเป็น"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "มาตรฐาน"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "ตัวเลือก"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "ส่วนเสริม"
 
@@ -2469,7 +2504,7 @@ msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2554,7 +2589,7 @@ msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2603,7 +2638,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2651,12 +2686,12 @@ msgstr "ไม่สามารถเรียกทำงานวิธีก
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ไม่รองรับระบบแพกเกจ '%s'"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
 
@@ -2669,177 +2704,209 @@ msgstr "ไม่สามารถ stat %s"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ไม่เข้าใจชนิดการตรึง %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "ผลรวมแฮชไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง"
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "ขนาดไม่ตรงกัน"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "ข้อมูลผิดพลาดในแฟ้ม diversion: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2892,11 +2959,11 @@ msgstr "กำลังสำรวจข้อมูลในแผ่นเพ
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
-"พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น %"
-"zu รายการ\n"
+"พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น "
+"%zu รายการ\n"
 
 #: apt-pkg/cdrom.cc:677
 msgid ""
@@ -2934,145 +3001,184 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ
 msgid "Source list entries for this disc are:\n"
 msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "เขียนแล้ว %i ระเบียน\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "ผลรวมแฮชไม่ตรงกัน"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "กำลังตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ไม่มีไดเรกทอรี '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "กำลังเตรียม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "กำลังแตกแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "กำลังเตรียมตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "ติดตั้ง %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "กำลังเตรียมถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "ถอดถอน %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
 "หรือเปล่า?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3090,10 +3196,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "ไม่พบรุ่น '%s' ของ '%s'"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "ไม่พบงาน %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)"
 
@@ -3145,8 +3272,8 @@ msgstr "การเชื่อมต่อถูกปิดก่อนเว
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "พบดัชนีแพกเกจ %i รายการ, ดัชนีซอร์ส %i รายการ, ดัชนีคำแปล %i รายการ และลายเซ็น %i "
 #~ "รายการ\n"
diff --git a/po/tl.po b/po/tl.po
index aa5087b5f..b79c820cb 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,158 +10,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
+"Language: tl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Normal na Pakete: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Purong Birtwual na Pakete: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Nag-iisang Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Halong Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Kulang/Nawawala: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Kabuuan ng mga Dependensiya: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Kabuuan ng Mapping ng Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Kabuuan ng Globbed String: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Kabuuan ng Hindi Nagamit na puwang: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Kabuuan ng puwang na napag-tuosan: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Wala sa sync ang talaksan ng paketeng %s."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Walang nahanap na mga pakete"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Talaksang Pakete:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Mga naka-Pin na Pakete:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(hindi nahanap)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Nakaluklok: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Kandidato: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(wala)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Naka-Pin na Pakete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -183,6 +183,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -318,12 +319,12 @@ msgstr ""
 "  -c=? Basahin ang talaksang pagkaayos na ito\n"
 "  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Hindi makapagsulat sa %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
 
@@ -663,79 +664,79 @@ msgstr "Problema sa pag-unlink ng %s"
 msgid "Failed to rename %s to %s"
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error sa pag-compile ng regex - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "ngunit ang %s ay nakaluklok"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "ngunit hindi ito maaaring iluklok"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "ngunit ito ay birtwal na pakete"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "ngunit ito ay hindi nakaluklok"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "ngunit ito ay hindi iluluklok"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Ang susunod na mga pakete ay iu-upgrade:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dahil sa %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -743,147 +744,242 @@ msgstr ""
 "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
 "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu iniluklok muli, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nai-downgrade, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Nakaluklok]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Bersyong Kandidato"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Dapat kayong mamili ng isa na iluluklok."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n"
+"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
+"sa ibang pinagmulan.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ay pinakabagong bersyon na.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ngunit ang %s ay iluluklok"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Inaayos ang mga dependensiya..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " ay bigo."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Hindi maayos ang mga dependensiya"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Hindi mai-minimize ang upgrade set"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Tapos"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr ""
 "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "May mga problema at -y ay ginamit na walang --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
 "org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 "Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kulang kayo ng libreng puwang sa %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Oo, gawin ang sinasabi ko!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -894,28 +990,28 @@ msgstr ""
 "Upang magpatuloy, ibigay ang pariralang '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Abort."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Nais niyo bang magpatuloy [O/h]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -923,128 +1019,57 @@ msgstr ""
 "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
 "subukang may --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Hindi maayos ang mga kulang na pakete."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Ina-abort ang pag-instol."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Paunawa, pinili ang %s imbes na %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Nakaluklok]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Bersyong Kandidato"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Dapat kayong mamili ng isa na iluluklok."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n"
-"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
-"sa ibang pinagmulan.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ay pinakabagong bersyon na.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release '%s' para sa '%s' ay hindi nahanap"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1054,7 +1079,7 @@ msgid_plural ""
 msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1062,11 +1087,11 @@ msgid_plural ""
 msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1082,46 +1107,26 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Hindi mahanap ang paketeng %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ngunit ang %s ay iluluklok"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1129,7 +1134,7 @@ msgstr ""
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1140,119 +1145,144 @@ msgstr ""
 "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
 "kailangan na hindi pa nalikha o linipat mula sa Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Hindi mahanap ang paketeng %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "ngunit ang %s ay iluluklok"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Sinusuri ang pag-upgrade... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Bigo"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Tapos"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kulang kayo ng libreng puwang sa %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1261,7 +1291,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1270,32 +1300,32 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
 "ng paketeng %s na tumutugon sa kinakailangang bersyon"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
-"s ay bagong-bago pa lamang."
+"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng "
+"%s ay bagong-bago pa lamang."
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1320,6 +1350,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1378,7 +1410,7 @@ msgstr ""
 "para sa karagdagang impormasyon at mga option.\n"
 "                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1628,9 +1660,9 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
@@ -1659,10 +1691,9 @@ msgstr "Bigo sa pag-stat ng %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Binabasa ang Listahan ng mga Pakete"
 
@@ -1796,12 +1827,12 @@ msgstr "Hindi nahanap ang Disk."
 msgid "File not found"
 msgstr "Hindi Nahanap ang Talaksan"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Bigo ang pag-stat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Bigo ang pagtakda ng oras ng pagbago"
 
@@ -1863,7 +1894,7 @@ msgstr "Lumipas ang koneksyon"
 msgid "Server closed the connection"
 msgstr "Sinarhan ng server ang koneksyon"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Error sa pagbasa"
 
@@ -1875,186 +1906,176 @@ msgstr "May sagot na bumubo sa buffer."
 msgid "Protocol corruption"
 msgstr "Sira ang protocol"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Error sa pagsulat"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Hindi maka-likha ng socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Hindi maka-konekta sa socket na passive."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "di makakuha ang getaddrinfo ng socket na nakikinig"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Hindi maka-bind ng socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Hindi makarinig sa socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Hindi malaman ang pangalan ng socket"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Hindi makapagpadala ng utos na PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Di kilalang pamilya ng address %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Bigo ang EPRT, sabi ng server ay: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Tanong"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Hindi ma-invoke "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Hindi maka-konekta sa %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kumokonekta sa %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Hindi maresolba ang '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Hindi maka-konekta sa %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Ina-abort ang pag-instol."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
-"Lalabas."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
 "fingerprint?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2062,16 +2083,6 @@ msgstr ""
 "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi "
 "available:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Hindi makapag-bukas ng pipe para sa %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Error sa pagbasa mula sa prosesong %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Naghihintay ng panimula"
@@ -2133,20 +2144,20 @@ msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Bigo sa pagsulat ng talaksang %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Internal na error"
 
@@ -2181,11 +2192,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2212,7 +2228,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Piniling %s ay hindi nahanap"
@@ -2347,155 +2363,172 @@ msgstr "Di makalipat sa %s"
 msgid "Failed to stat the cdrom"
 msgstr "Bigo sa pag-stat ng cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Hindi mabuksan ang talaksang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa "
 "nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "hindi makuha ang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Naghudyat ang sub-process %s ng error code (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Hindi makapag-bukas ng pipe para sa %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Problema sa pagsara ng talaksan"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problema sa pag-sync ng talaksan"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Problema sa pag-unlink ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Problema sa pag-sync ng talaksan"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Walang laman ang cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Sira ang talaksan ng cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Dependensiya"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Mungkahi"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Rekomendado"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Tunggali"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Pumapalit"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Linalaos"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "kailangan"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "extra"
 
@@ -2526,7 +2559,7 @@ msgstr "Bigo ang pagbukas ng %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Bigo sa pagsulat ng talaksang %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2611,7 +2644,7 @@ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2663,7 +2696,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2714,12 +2747,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Hindi suportado ang sistema ng paketeng '%s'"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
 
@@ -2732,146 +2765,168 @@ msgstr "Hindi ma-stat ang %s"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
 "ito"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Hindi naintindihan ang uri ng pin %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Hindi akma ang versioning system ng cache"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "May naganap na error habang prinoseso ang %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Kinukuha ang Talaksang Provides"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "IO Error sa pag-imbak ng source cache"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2880,7 +2935,7 @@ msgstr ""
 "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
 "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2889,7 +2944,7 @@ msgstr ""
 "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
 "niyong ayusin ng de kamay ang paketeng ito."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2897,25 +2952,35 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Di tanggap na linya sa talaksang diversion: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2969,8 +3034,8 @@ msgstr "Sinisiyasat ang Disc para sa talaksang index...\n"
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
 "signature\n"
@@ -3011,145 +3076,184 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Nagsulat ng %i na record.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
 "mismatch\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Isasaayos ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Hinahanda ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Binubuklat ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Hinahanda ang %s upang isaayos"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Naghahanda para sa pagtanggal ng %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Hindi maaldaba ang directory ng talaan"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3167,10 +3271,34 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Nagsara ng maaga ang koneksyon"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Release '%s' para sa '%s' ay hindi nahanap"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Hindi mahanap ang paketeng %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
+#~ "Lalabas."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Hindi makapag-bukas ng pipe para sa %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Error sa pagbasa mula sa prosesong %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)"
 
@@ -3222,8 +3350,8 @@ msgstr "Nagsara ng maaga ang koneksyon"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
 #~ "signature\n"
diff --git a/po/uk.po b/po/uk.po
index 5ba39c72a..6b5eb8b17 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,158 +6,158 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2006-07-29 15:57+0300\n"
 "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакунок %s версії %s має незадоволену залежність:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Не можу знайти пакунок %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Всього імен пакунків : "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Всього імен пакунків : "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Нормальних пакунків: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Чисто віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Окремих віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr " Змішаних віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Пропущено: "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Всього залежностей: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Всього відносин Provides: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Всього розгорнутих рядків: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Всього інформації про залежності: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Порожнього місця в кеші: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Загальний простір полічений для: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Перелік пакунків %s розсинхронізований."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Ви повинні задати рівно один шаблон"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Не знайдено жодного пакунка"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Не можу знайти пакунок %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Переліки пакунків:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Зафіксовані пакунки:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(не знайдено)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Встановлено: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(відсутній)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Фіксатор(pin) пакунка: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Таблиця версій:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s для %s %s скомпільовано %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -179,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -311,12 +312,12 @@ msgstr ""
 "  -c=? Читати зазначений конфігураційний файл\n"
 "  -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Неможливо записати в %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Неможливо визначити версію debconf. Він встановлений?"
 
@@ -661,79 +662,79 @@ msgstr "Не вдалося видалити %s"
 msgid "Failed to rename %s to %s"
 msgstr "Не вдалося перейменувати %s в %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Т"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Помилка компіляції регулярного виразу - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Пакунки, що мають незадоволені залежності:"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "але %s вже встановлений"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "але він не може бути встановлений"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "але це віртуальний пакунок"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "але він не встановлений"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "але він не буде встановлений"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " чи"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "НОВІ пакунки, які будуть встановлені:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Пакунки, які будуть залишені в незмінному вигляді:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакунки, будуть замінені на більш СТАРІ версії:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (внаслідок %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -741,147 +742,245 @@ msgstr ""
 "УВАГА: Ці істотно важливі пакунки будуть вилучені.\n"
 "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "оновлено %lu, встановлено %lu нових пакунків, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr " %lu перевстановлено, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакунків замінено на старі версії, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "для видалення відмічено %lu пакунків, і %lu пакунків не оновлено.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не встановлено до кінця чи видалено %lu пакунків.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Обрана версія %s (%s) для %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Встановлено]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Версії кандидатів"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Ви повинні явно вказати, який саме ви хочете встановити."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Пакунок %s недоступний, але згадується у переліку залежностей іншого "
+"пакунка.\n"
+"Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не "
+"згаданих в sources.list\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Однак наступні пакунки можуть його замінити:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Для пакунка %s не знайдені кандидати на встановлення"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Помітьте, замість %2$s вибирається %1$s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Пропускається %s - пакунок вже встановлений, і опція upgrade не "
+"встановлена.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Пропускається %s - пакунок вже встановлений, і опція upgrade не "
+"встановлена.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Вже встановлена найновіша версія %s.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "але %s буде встановлений"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Пакунок %s не встановлений, тому не може бути видалений\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Виправлення залежностей..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " невдача."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Неможливо скоригувати залежності"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Неможливо мінімізувати набір оновлень"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Виконано"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f "
 "install'."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "Незадоволені залежності. Спробуйте використати -f."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Встановити ці пакунки без перевірки [т/Н]? "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Деякі пакунки неможливо автентифікувати"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Існують проблеми, а опція -y використана без --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутрішня помилка, InstallPackages була викликана з непрацездатними "
 "пакунками!"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакунки необхідно видалити, але видалення заборонене."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутрішня помилка, Ordering не завершилася"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Неможливо прочитати перелік джерел."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Необхідно завантажити %sB/%sB архівів.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необхідно завантажити %sB архівів.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Після розпакування об'єм зайнятого дискового простору зросте на %sB.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не вдалося визначити кількість вільного місця в %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостатньо вільного місця в %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запитане виконання тільки тривіальних операцій, але це не тривіальна "
 "операція."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Так, робити, як я скажу!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -892,28 +991,28 @@ msgstr ""
 "Щоб продовжити, введіть фразу: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Перервано."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Бажаєте продовжити [Т/н]? "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не вдалося завантажити %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Деякі файли не вдалося завантажити"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -921,131 +1020,57 @@ msgstr ""
 "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
 "або спробувати повторити запуск з ключем --fix-missing?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing і зміна носія в даний момент не підтримується"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Неможливо виправити втрачені пакунки."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Переривається встановлення."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Помітьте, замість %2$s вибирається %1$s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Пропускається %s - пакунок вже встановлений, і опція upgrade не "
-"встановлена.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Пропускається %s - пакунок вже встановлений, і опція upgrade не "
-"встановлена.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Пакунок %s не встановлений, тому не може бути видалений\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Встановлено]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Версії кандидатів"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Ви повинні явно вказати, який саме ви хочете встановити."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Пакунок %s недоступний, але згадується у переліку залежностей іншого "
-"пакунка.\n"
-"Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не "
-"згаданих в sources.list\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Однак наступні пакунки можуть його замінити:"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Для пакунка %s не знайдені кандидати на встановлення"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Вже встановлена найновіша версія %s.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Реліз '%s' для '%s' не знайдений"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Версія '%s' для '%s' не знайдена"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Обрана версія %s (%s) для %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Команді update не потрібні аргументи"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1055,7 +1080,7 @@ msgid_plural ""
 msgstr[0] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 msgstr[1] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1063,11 +1088,11 @@ msgid_plural ""
 msgstr[0] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 msgstr[1] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1085,46 +1110,26 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Наступна інформація можливо допоможе Вам:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутрішня помилка, AllUpgrade все поламав"
 
-#: cmdline/apt-get.cc:1654
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Не можу знайти пакунок %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Не можу знайти пакунок %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
-
-#: cmdline/apt-get.cc:1828
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "але %s буде встановлений"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
 "install':"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1132,7 +1137,7 @@ msgstr ""
 "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
 "вказуючи імені пакунка (або знайдіть інше рішення)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1143,125 +1148,150 @@ msgstr ""
 "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
 "ще не створені або були вилучені з Incoming."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Зламані пакунки"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Будуть встановлені наступні додаткові пакунки:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Пропоновані пакунки:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Рекомендовані пакунки:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Не можу знайти пакунок %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "але %s буде встановлений"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Обчислення оновлень... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Невдача"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Виконано"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Неможливо заблокувати теку для завантаження"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаємо вже завантажений файл '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостатньо місця в %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Завантаження вихідних текстів %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Деякі архіви не вдалося завантажити."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
 "розпаковані вихідні тексти\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакування '%s' завершилася невдало.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчилася невдало.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Породжений процес завершився невдало"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для перевірки залежностей для побудови необхідно вказати як мінімум один "
 "пакунок"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Неможливо одержати інформацію про залежності для побудови %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежностей для побудови.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1269,7 +1299,7 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1278,32 +1308,32 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
 "пакунка %s не задовольняє умови"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
 "пакунок %s новіше, аніж треба"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежності для побудови %s не можуть бути задоволені."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Обробка залежностей для побудови закінчилася невдало"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1328,6 +1358,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1390,7 +1422,7 @@ msgstr ""
 "містять більше інформації.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1642,9 +1674,9 @@ msgstr "Файл %s/%s перезаписує інший з пакету %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неможливо прочитати %s"
@@ -1673,10 +1705,9 @@ msgstr "Не вдалося прочитати атрибути %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Теки info і temp повинні бути на тій самій файловій системі"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Читання переліків пакетів"
 
@@ -1812,12 +1843,12 @@ msgstr "Диск не знайдено."
 msgid "File not found"
 msgstr "Файл не знайдено"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Не вдалося одержати атрибути"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Не вдалося встановити час модифікації"
 
@@ -1879,7 +1910,7 @@ msgstr "Час з'єднання вичерпався"
 msgid "Server closed the connection"
 msgstr "Сервер закрив з'єднання"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Помилка читання"
 
@@ -1891,186 +1922,177 @@ msgstr "Відповідь переповнила буфер."
 msgid "Protocol corruption"
 msgstr "Спотворений протокол"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Помилка запису"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Неможливо створити сокет (socket)"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Неможливо під'єднати пасивний сокет (passive socket)."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 #, fuzzy
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Виклик getaddrinfo не зміг отримати сокет"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Неможливо приєднатися до сокета"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 #, fuzzy
 msgid "Could not listen on the socket"
 msgstr "Не можливо утримувати з'єднання на сокеті"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Не вдалося визначити назву сокета"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Неможливо відіслати команду PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Невідоме адресове сімейство %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Час з'єднання з сокетом даних вичерпався"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неможливо завантажити файл, сервер мовив: '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Час з'єднання з сокетом (socket) з даними вичерпався"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача даних обірвалася, сервер мовив '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Черга"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Неможливо викликати "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "З'єднання з %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Неможливо ініціалізувати з'єднання з %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Не можливо під'єднатися до %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "З'єднання з %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Не можу знайти IP адрес для %s"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Тимчасова помилка при отриманні IP адреси '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Не можливо під'єднатися до %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Переривається встановлення."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
 "відбиток?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Знайдено як мінімум один невірний підпис."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Невідома помилка виконання gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Слідуючі підписи були невірними:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2078,16 +2100,6 @@ msgstr ""
 "Слідуючі підписи не можуть бути перевірені, тому що, публічний ключ "
 "відсутній:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Неможливо відкрити канал (pipe) для %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Помилка читання з процесу %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Очікування на заголовки"
@@ -2151,20 +2163,20 @@ msgstr "Помилка читання з сервера. Віддалена ст
 msgid "Error reading from server"
 msgstr "Помилка читання з сервера"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Не вдалося записати файл %s"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
@@ -2199,11 +2211,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2230,7 +2247,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Вибір %s не знайдено"
@@ -2365,157 +2382,174 @@ msgstr "Неможливо зробити зміни у %s"
 msgid "Failed to stat the cdrom"
 msgstr "Не вдалося прочитати атрибути cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Блокування не використовується, так як файл блокування %s доступний тільки "
 "для читання"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Не можливо відкрити lock файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Блокування не використовується, так як файл блокування %s знаходиться на "
 "файловій системі nfs"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, fuzzy, c-format
 msgid "Could not get lock %s"
 msgstr "Не можливо отримати lock %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Очікується на %s але його тут немає"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Підпроцес %s отримав segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Підпроцес %s отримав segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Підпроцес %s повернув код помилки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Підпроцес %s раптово завершився"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Не можливо відкрити файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Неможливо відкрити канал (pipe) для %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
 msgstr "Проблема з закриттям файла"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Проблема з закриттям файла"
+
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Проблема з синхронізацією файла"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Проблема з роз'єднанням файла"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Проблема з синхронізацією файла"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Кеш пакунків пустий"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Файл кешу пакунків пошкоджений"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Файл кешу пакунків має несумісну версію"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT не підтримує систему призначення версій '%s'"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Кеш пакунків був побудований для іншої архітектури"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Залежності (Depends)"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Пре-Залежності (PreDepends)"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Пропонує (Suggests)"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Рекомендує"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Конфлікти"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Заміняє (Replaces)"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Застарілі (Obsoletes)"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "Важливі (Important)"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "Необхідні (Required)"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "Стандартні (Standard)"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "Необов'язкові (Optional)"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "Додаткові (Extra)"
 
@@ -2546,7 +2580,7 @@ msgstr "Не вдалося відкрити %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Не вдалося записати файл %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2633,7 +2667,7 @@ msgstr "Спотворена лінія %u у переліку джерел %s (
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2684,7 +2718,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2735,12 +2769,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Система пакування '%s' не підтримується"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неможливо визначити тип необхідної системи пакування "
 
@@ -2753,143 +2787,165 @@ msgstr "Неможливо прочитати атрибути %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Ви повинні записати певні 'source' посилання в твій sources.list"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Не можу обробити чи відкрити перелік пакунків чи status файл."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Невірний запис в preferences файлі, відсутній заголовок Package"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Не зрозумів тип %s для pin"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Не встановлено пріоритету (або встановлено 0) для pin"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Кеш має несумісну систему призначення версій"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Ви перевищили кількість імен пакунків, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Ви перевищили кількість версій, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Ви перевищили кількість версій, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Ви перевищили кількість залежностей які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Помилка, яка була викликана внаслідок обробки %s (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 #, fuzzy
 msgid "Collecting File Provides"
 msgstr "Збирання інформації про  файлів "
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Помилка IO під час збереження джерельного кешу"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "Не вдалося перейменувати, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "Невідповідність MD5Sum"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Невідповідність MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 #, fuzzy
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Відсутній публічний ключ для заданих ID ключа:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2898,7 +2954,7 @@ msgstr ""
 "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
 "виправити цей пакунок. (due to missing arch)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2907,32 +2963,42 @@ msgstr ""
 "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
 "виправити цей пакунок."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Невідповідність розміру"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Неможливо обробити файл %s пакунку (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Помітьте, замість %2$s вибирається %1$s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Невірна лінія в файлі diversions: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неможливо обробити файл %s пакунку (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2986,8 +3052,8 @@ msgstr "Диск сканується на індексні файли..\n"
 #: apt-pkg/cdrom.cc:666
 #, fuzzy, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n"
 
 #: apt-pkg/cdrom.cc:677
@@ -3026,144 +3092,183 @@ msgstr "Записується новий перелік джерел\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Перелік джерел для цього диску:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записано %i записів.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записано %i записів з %i відсутніми файлами.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записано %i записів з %i невідповідними файлам\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Відкривається конфігураційний файл %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Невідповідність MD5Sum"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфігурація %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Видаляється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Lists тека %spartial відсутня."
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Не можливо відкрити файл %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Підготовка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Розпакування %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Підготовка до конфігурації %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Підготовка до видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Підготовка до повного видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Неможливо заблокувати теку з переліками пакунків"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3181,10 +3286,33 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "З'єднання завершено передчасно"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Реліз '%s' для '%s' не знайдений"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Версія '%s' для '%s' не знайдена"
+
+#, fuzzy
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Не можу знайти пакунок %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Неможливо відкрити канал (pipe) для %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Помилка читання з процесу %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)"
 
@@ -3236,8 +3364,8 @@ msgstr "З'єднання завершено передчасно"
 
 #, fuzzy
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n"
 
 #, fuzzy
diff --git a/po/vi.po b/po/vi.po
index 0104b7bea..c19fa667c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,158 +6,159 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2008-12-22 19:04+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\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"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Không thể định vị gói %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "Tổng số tên gói: "
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Tổng số tên gói: "
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  Gói chuẩn: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  Gói ảo nguyên chất: "
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  Gói ảo đơn: "
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  Gói ảo hỗn hợp: "
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  Thiếu : "
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "Tổng phiên bản riêng: "
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "Tổng mô tả riêng: "
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "Tổng đồ phụ thuộc: "
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "Tổng liên quan phiên bản và tập tin: "
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "Tổng liên quan mô tả/tập tin: "
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "Tổng ảnh xạ Miễn là: "
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "Tổng chỗ phiên bản phụ thuộc: "
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Tổng chỗ nghỉ: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "Tổng chỗ đã tính: "
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Tập tin gói %s không đồng bộ được."
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "Bạn phải đưa ra đúng một mẫu"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "Không tìm thấy gói"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Không thể định vị gói %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Tập tin gói:"
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Các gói đã ghim:"
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(không tìm thấy)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  Đã cài đặt: "
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Ứng cử: "
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(không có)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Ghim gói: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s cho %s được biên dịch trên %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -178,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -323,12 +325,12 @@ msgstr ""
 "  -c=? \t\tĐọc tập tin cấu hình này\n"
 "  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Không thể ghi vào %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
 
@@ -679,79 +681,79 @@ msgstr "Gặp lỗi khi bỏ liên kết %s"
 msgid "Failed to rename %s to %s"
 msgstr "Việc đổi tên %s thành %s bị lỗi"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "C"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Lỗi biên dich biểu thức chính quy - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "nhưng mà %s đã được cài đặt"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "nhưng mà %s sẽ được cài đặt"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "nhưng mà nó không có khả năng cài đặt"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "nhưng mà nó là gói ảo"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "nhưng mà nó chưa được cài đặt"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "nhưng mà nó sẽ không được cài đặt"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " hay"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "Theo đây có những gói đã được giữ lại:"
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Theo đây có những gói sẽ được nâng cấp:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "Theo đây có những gói sẽ được thay đổi:"
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (do %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -759,144 +761,237 @@ msgstr ""
 "CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n"
 "ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác."
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu đã nâng cấp, %lu mới được cài đặt, "
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu được cài đặt lại, "
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu được hạ cấp, "
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Gói %s là gói ảo được cung cấp do :\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Đã cài đặt]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Phiên bản ứng cử"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "Bạn nên chọn một cách dứt khoát gói cần cài."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Gói %s không phải sẵn sàng, nhưng mà một gói khác\n"
+"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
+"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Gói %s không có ứng cử cài đặt"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Ghi chú : đang chọn %s thay vì %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s là phiên bản mơi nhất.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "Đang sửa cách phụ thuộc..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " đã thất bại."
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "Không thể sửa cách phụ thuộc"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "Không thể cực tiểu hóa bộ nâng cấp"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " Đã xong"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết."
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 "Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy "
 "chọn « -f »."
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "CẢNH BÁO : không thể xác thực những gói theo đây."
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "Cảnh báo xác thực bị đè.\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "Một số gói không thể được xác thực"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có  « --force-yes »"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng."
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt."
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Cần phải lấy %sB/%sB kho.\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Cần phải lấy %sB kho.\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Không thể quyết định chỗ rảnh trong %s"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s."
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể."
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Có, làm đi."
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -907,157 +1002,87 @@ msgstr ""
 "Để tiếp tục thì hãy gõ cụm từ « %s »\n"
 "?]"
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "Hủy bỏ."
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Việc gói %s bị lỗi  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải về được"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "Mới tải về xong và trong chế độ chỉ tải về"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy cập "
-"nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?"
+"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy "
+"cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi "
 "phương tiện."
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "Không thể sửa những gói còn thiếu."
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "Đang hủy bỏ cài đặt."
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Ghi chú : đang chọn %s thay vì %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Gói %s là gói ảo được cung cấp do :\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [Đã cài đặt]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Phiên bản ứng cử"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "Bạn nên chọn một cách dứt khoát gói cần cài."
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Gói %s không phải sẵn sàng, nhưng mà một gói khác\n"
-"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
-"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Gói %s không có ứng cử cài đặt"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s là phiên bản mơi nhất.\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Không tìm thấy bản phát hành « %s » cho « %s »"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "Lệnh cập nhật không chấp nhật đối số"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1067,7 +1092,7 @@ msgid_plural ""
 msgstr[0] ""
 "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1075,11 +1100,11 @@ msgid_plural ""
 msgstr[0] ""
 "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1097,51 +1122,31 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Không tìm thấy tác vụ %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Không tìm thấy gói %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install "
-"» mà không có gói nào (hoặc ghi rõ cách quyết định)."
+"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f "
+"install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1153,127 +1158,152 @@ msgstr ""
 "bất định, có lẽ chưa tạo một số gói cần thiết,\n"
 "hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "Gói bị ngắt"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "Những gói thêm theo đây sẽ được cài đặt:"
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "Gói được đệ nghị:"
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "Gói được khuyên:"
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Không tìm thấy gói %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "Đang tính nâng cấp... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Bị lỗi"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "Xong"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "Không thể khóa thư mục tải về"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Không tìm thấy gói nguồn cho %s"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Không đủ sức chứa còn rảnh trong %s"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Cần phải lấy %sB kho nguồn.\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lấy nguồn %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "Việc lấy một số kho bị lỗi."
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lệnh giải nén « %s » bị lỗi.\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1282,31 +1312,31 @@ msgstr ""
 "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
 "của gói %s có thể thỏa điều kiện phiên bản."
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "Mô-đun đã hỗ trợ :"
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1331,6 +1361,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1398,7 +1430,7 @@ msgstr ""
 "sources.list(5) và apt.conf(5).\n"
 "                       Trình APT này có năng lực của siêu bò.\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1650,9 +1682,9 @@ msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "Không thể đọc %s"
@@ -1683,10 +1715,9 @@ msgstr ""
 "Những thư mục info (thông tin) và temp (tạm thời) cần phải trong cùng một hệ "
 "thống tập tin"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "Đang đọc các danh sách gói..."
 
@@ -1771,8 +1802,8 @@ msgstr "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ ph
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
-"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s », « %s » hay « %"
-"s »"
+"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s », « %s » hay "
+"« %s »"
 
 #: apt-inst/deb/debfile.cc:110
 #, c-format
@@ -1801,8 +1832,8 @@ msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"Hãy sử dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không thể "
-"sử dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới."
+"Hãy sử dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không "
+"thể sử dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới."
 
 #: methods/cdrom.cc:218
 msgid "Wrong CD-ROM"
@@ -1821,12 +1852,12 @@ msgstr "Không tìm thấy đĩa"
 msgid "File not found"
 msgstr "Không tìm thấy tập tin"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "Việc lấy các thông tin bị lỗi"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "Việc lập giờ sửa đổi bị lỗi"
 
@@ -1888,7 +1919,7 @@ msgstr "Thời hạn kết nối"
 msgid "Server closed the connection"
 msgstr "Máy phục vụ đã đóng kết nối"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lỗi đọc"
 
@@ -1900,198 +1931,180 @@ msgstr "Một trả lời đã tràn bộ đệm."
 msgid "Protocol corruption"
 msgstr "Giao thức bị hỏng"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Lỗi ghi"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "Không thể tạo ổ cắm"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "Không thể kết nối ổ cắm bị động."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "Không thể đóng kết ổ cắm"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "Không thể lắng nghe trên ổ cắm đó"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "Không thể quyết định tên ổ cắm đó"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "Không thể gởi lệnh PORT (cổng)"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Không biết nhóm địa chỉ %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Gặp khó khăn băm tập tin"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Không thể lấy tập tin: máy phục vụ nói « %s »"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Ổ cắm dữ liệu đã quá giờ"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói « %s »"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "Truy vấn"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "Không thể gọi "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Đang kết nối đến %s (%s)..."
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[Địa chỉ IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Không thể sở khởi kết nối đến %s:%s (%s)."
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Không thể kết nối đến %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "Đang kết nối đến %s..."
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Không thể tháo gỡ « %s »"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Không thể kết nối đến %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Đang hủy bỏ cài đặt."
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "Gặp ít nhất một chữ ký không hợp lệ."
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "Gặp lỗi lạ khi thực hiện gpgv"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "Những chữ ký theo đây là không hợp lệ:\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Không thể mở ống dẫn cho %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Gặp lỗi đọc từ tiến trình %s"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Đang đợi những phần đầu..."
@@ -2157,19 +2170,19 @@ msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng
 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "Lỗi cắt ngắn tập tin"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "Dữ liệu dòng đầu sai"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "Kết nối bị ngắt"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
@@ -2204,11 +2217,16 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2235,7 +2253,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "Không tìm thấy vùng chọn %s"
@@ -2366,152 +2384,169 @@ msgstr "Không thể chuyển đổi sang %s"
 msgid "Failed to stat the cdrom"
 msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Không thể mở tập tin khóa %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Không thể lấy khóa %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Đã đợi %s nhưng mà chưa gặp nó"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Tiến trình con %s đã thoát bất ngờ"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "Không thể mở tập tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Không thể mở ống dẫn cho %s"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gặp lỗi khi đóng tập tin đó"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "Gặp lỗi khi đóng tập tin đó"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "Gặp lỗi khi bỏ liên kết tập tin đó"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "Bộ nhớ tạm gói rỗng"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "Tập tin bộ nhớ tạm gói bị hỏng"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "Phụ thuộc"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "Phụ thuộc trước"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "Đệ nghị"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "Khuyên"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "Xung đột"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "Thay thế"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "Làm cũ"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "Làm hư"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "quan trọng"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "cần"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "chuẩn"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "tùy chọn"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "thêm"
 
@@ -2541,7 +2576,7 @@ msgstr "Lỗi mở tập tin tình trạng StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2633,7 +2668,7 @@ msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)."
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s."
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2682,7 +2717,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt."
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2732,12 +2767,12 @@ msgstr "Phương pháp %s đã không bắt đầu cho đúng."
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Không hỗ trợ hệ thống đóng gói « %s »"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
 
@@ -2749,146 +2784,169 @@ msgstr "Không thể lấy các thông tin về %s."
 #: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
-"Bạn phải để một số địa chỉ URI « nguồn » vào « sources.list » (danh sách nguồn)"
+"Bạn phải để một số địa chỉ URI « nguồn » vào « sources.list » (danh sách "
+"nguồn)"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Không thể phân tích hay mở danh sách gói hay tâp tin trạng thái."
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package "
 "(Gói)."
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Không hiểu kiểu ghim %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Gặp lỗi khi xử lý %s (NewFileDesc2 - tập tin mô tả mới 2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 "Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là "
 "một tập tin)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum (tổng kiểm) không khớp được"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Sai khớp tổng băm (hash sum)"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2897,7 +2955,7 @@ msgstr ""
 "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
 "này, do thiếu kiến trúc."
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2906,7 +2964,7 @@ msgstr ""
 "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
 "này."
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2914,25 +2972,35 @@ msgstr ""
 "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
 "tin:) cho gói %s."
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "Kích cỡ không khớp được"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Không thể phân tách tập tin gói %s (1)"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Ghi chú : đang chọn %s thay vì %s\n"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Gặp dòng không hợp lệ trong tập tin trệch đi: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Không thể phân tách tập tin gói %s (1)"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2985,8 +3053,8 @@ msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n"
 
@@ -3026,145 +3094,184 @@ msgstr "Đang ghi danh sách nguồn mới...\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Mới ghi %i mục ghi.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
 "nhau\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Đang mở tập tin cấu hình %s..."
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Sai khớp tổng băm (hash sum)"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "Đang cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "Đang cấu hình %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "Đang gỡ bỏ %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Mới gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Đang chạy bộ gây nên tiến trình cuối cùng cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Thiếu thư mục « %s »"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Không thể mở tập tin %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "Đang chuẩn bị %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "Đang mở gói %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Đang chuẩn bị cấu hình %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "Đã cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Đang chuẩn bị gỡ bỏ %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "Đã gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..."
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "Mới gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Không thể khóa thư mục danh sách"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3182,10 +3289,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "Kết nối bị đóng quá sớm."
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Không tìm thấy bản phát hành « %s » cho « %s »"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Không tìm thấy tác vụ %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Không thể mở ống dẫn cho %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Gặp lỗi đọc từ tiến trình %s"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr ""
 #~ "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 99efc1beb..9aebdb7cd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,155 +9,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-12-02 01:00+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "未发现软件包 %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "软件包名称总数："
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "软件包名称总数："
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  普通软件包："
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  缺失："
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "按版本共计："
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "按不同的说明共计："
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "按说明/文件关系共计："
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "依赖关系版本名所占空间共计："
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "Slack 空间共计："
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出一个表达式"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "未发现软件包 %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "软件包文件："
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(没有找到)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  已安装："
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  候选软件包："
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(无)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -178,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -309,12 +311,12 @@ msgstr ""
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
@@ -648,79 +650,79 @@ msgstr "在使用 unlink 删除 %s 时出错"
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "下列软件包有未满足的依赖关系："
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "但无法安装它"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "但是它是虚拟软件包"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr " 或"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "下列软件包的版本将保持不变："
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "下列软件包将被升级："
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -728,140 +730,233 @@ msgstr ""
 "【警告】：下列基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安装了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "选定了版本为 %s (%s) 的 %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [已安装]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "候选版本"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "请您明确地选择一个来进行安装。"
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
+"这可能意味着这个缺失的软件包可能已被废弃，\n"
+"或者只能在其他发布源中找到\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "可是下列软件包取代了它："
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "软件包 %s 还没有可供安装的候选者"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "注意，选取 %s 而非 %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "不能重新安装 %s，因为无法下载它。\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 已经是最新的版本了。\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s 被设置为手动安装。\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "正在更正依赖关系..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " 失败。"
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "无法更正依赖关系"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "无法最小化要升级的软件包集合"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：下列软件包不能通过验证！"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "不经验证就安装这些软件包吗？[y/N] "
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下载 %sB/%sB 的软件包。\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下载 %sB 的软件包。\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的可用空间"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 上没有足够的可用空间。"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "是，按我说的做！"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -872,28 +967,28 @@ msgstr ""
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "中止执行。"
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "有一些文件无法下载"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -901,126 +996,57 @@ msgstr ""
 "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
 "再试试？"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前还不支持 --fix-missing 和介质交换"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "中止安装。"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "注意，选取 %s 而非 %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr " [已安装]"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "候选版本"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "请您明确地选择一个来进行安装。"
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
-"这可能意味着这个缺失的软件包可能已被废弃，\n"
-"或者只能在其他发布源中找到\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "可是下列软件包取代了它："
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "软件包 %s 还没有可供安装的候选者"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s，因为无法下载它。\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本了。\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”发布版本"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "选定了版本为 %s (%s) 的 %s\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "无法获取源软件包列表 %s 的状态"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr " update 命令不需要参数"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1030,7 +1056,7 @@ msgid_plural ""
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："
 msgstr[1] "下列软件包是自动安装的并且现在不需要了："
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1038,11 +1064,11 @@ msgid_plural ""
 msgstr[0] "%lu 个自动安装的的软件包现在不需要了\n"
 msgstr[1] "%lu 个自动安装的的软件包现在不需要了\n"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用'apt-get autoremove'来删除它们"
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1058,43 +1084,23 @@ msgstr "似乎自动删除工具损坏了一些软件，这不应该发生。请
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "下列信息可能会对解决问题有所帮助："
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动删除工具坏事了"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部错误，全部升级工具坏事了"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "无法找到任务 %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "无法找到软件包 %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1102,7 +1108,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1113,158 +1119,184 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "破损的软件包"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "无法找到软件包 %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s 被设置为手动安装。\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "正在对升级进行计算... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "失败"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的可用空间"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "子进程出错"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系信息"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
-"$s 依赖关系"
+"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
+"%1$s 依赖关系"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "支持的模块："
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1288,6 +1320,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1347,7 +1381,7 @@ msgstr ""
 "以获取更多信息和选项。\n"
 "                       本 APT 具有超级牛力。\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1594,9 +1628,9 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
@@ -1625,10 +1659,9 @@ msgstr "无法读取 %sinfo 的状态"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info 和 temp 目录要求处于同一文件系统之下"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
@@ -1760,12 +1793,12 @@ msgstr "找不到盘片。"
 msgid "File not found"
 msgstr "无法找到该文件"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
@@ -1826,7 +1859,7 @@ msgstr "连接超时"
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "读错误"
 
@@ -1838,196 +1871,178 @@ msgstr "回应超出了缓存区大小。"
 msgid "Protocol corruption"
 msgstr "协议有误"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "写出错"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "无法创建套接字"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "无法连接被动模式的套接字。"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 无法得到监听套接字"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "无法绑定套接字"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "无法在套接字上监听"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "无法确定套接字的名字"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "无法发出 PORT 指令"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "无法识别的地址族 %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "数据套接字连接超时"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "无法获取文件，服务器响应信息为“%s”"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "数据套接字超时"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "数据传送出错，服务器响应信息为“%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "查询"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "正在连接 %s (%s)"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "无法发起与 %s:%s (%s) 的连接"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "无法连接上 %s:%s (%s)，连接超时"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "无法解析域名“%s”"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "解析“%s:%s”时，出现了某些故障(%i)"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "中止安装。"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "运行 gpgv 时发生未知错误"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "无法为 %s 开启管道"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "从 %s 进程读取数据出错"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "正在等待报头"
@@ -2089,19 +2104,19 @@ msgstr "从服务器读取数据时出错，对方关闭了连接"
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "无法截断文件"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "内部错误"
 
@@ -2138,11 +2153,16 @@ msgstr ""
 "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
 "apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2169,7 +2189,7 @@ msgstr "%li分 %li秒"
 msgid "%lis"
 msgstr "%li秒"
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "找不到您选则的 %s"
@@ -2300,152 +2320,169 @@ msgstr "无法切换工作目录到 %s"
 msgid "Failed to stat the cdrom"
 msgstr "无法读取盘片的状态"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "无法打开锁文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "无法在 nfs 文件系统上使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "无法获得锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "无法为 %s 开启管道"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "读取文件出错，还剩 %lu 字节没有读出"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "关闭文件出错"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "关闭文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "同步文件出错"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存文件损坏了"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的硬件构建的"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "依赖"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "预依赖"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "建议"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "推荐"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "冲突"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "替换"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "废弃"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "破坏"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr "增强"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "必需"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "标准"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "可选"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "额外"
 
@@ -2475,7 +2512,7 @@ msgstr "无法打开状态文件 %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2560,7 +2597,7 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2610,7 +2647,7 @@ msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2659,12 +2696,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 
@@ -2677,139 +2714,161 @@ msgstr "无法读取 %s 的状态。"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "无法识别锁定的类型 %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "处理 %s (NewPackage)时出错"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "处理 %s (UsePackage1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "处理 %s (NewFileDesc1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "处理 %s (UsePackage2)时出错"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "处理 %s (NewFileVer1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "处理 %s (NewVersion1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "处理 %s (UsePackage3)时出错"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "处理 %s (NewVersion2)时出错"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "处理 %s (NewFileDesc2)时出错"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "处理 %s (FindPkg)时出错"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "处理 %s (CollectFileProvides)时出错"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2818,7 +2877,7 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2826,31 +2885,41 @@ msgid ""
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "无法解析软件包仓库 Release 文件 %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2903,8 +2972,8 @@ msgstr "正在盘片中查找索引文件..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
@@ -2947,143 +3016,182 @@ msgstr "正在写入新的源列表\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "正在打开配置文件 %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 不见了"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr "正在运行 dpkg"
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, fuzzy, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此问题。"
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr "未锁定"
 
@@ -3101,10 +3209,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "未找到“%2$s”的“%1$s”发布版本"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "未找到“%2$s”的“%1$s”版本"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "无法找到任务 %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "无法为 %s 开启管道"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "从 %s 进程读取数据出错"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "处理 %s (NewVersion2)时出错"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
 
@@ -3162,8 +3291,8 @@ msgstr "连接被永久关闭"
 #~ msgstr "归档文件标签：%s \n"
 
 #~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
 #~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1438230e6..13b61d3fa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,156 +8,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-04 13:37+0200\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
-#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
-#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
-#: cmdline/apt-cache.cc:1606
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "找不到套件 %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
 msgid "Total package names: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package structures: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
 msgstr "  一般套件："
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
 msgstr "  完全虛擬套件："
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
 msgstr "  單一虛擬套件："
 
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:329
 msgid "  Mixed virtual packages: "
 msgstr "  混合虛擬套件："
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:330
 msgid "  Missing: "
 msgstr "  找不到："
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
 msgstr "個別版本合計："
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
 msgstr "個別版本類別合計："
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
 msgstr "相依關係合計："
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
 msgstr "版本/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
 msgstr "類別/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
 msgstr "提供者對應合計："
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
 msgstr "所有字串合計："
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
 msgstr "相依版本空間合計："
 
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
 msgstr "間暇空間合計："
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
 msgstr "統計後的空間合計："
 
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "套件檔 %s 未同步。"
 
-#: cmdline/apt-cache.cc:1299
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"
 msgstr "您必須明確得給定一個樣式"
 
-#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
 msgid "No packages found"
 msgstr "未找到套件"
 
-#: cmdline/apt-cache.cc:1548
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "找不到套件 %s"
+
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "套件檔："
 
-#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "快取資料未同步，無法 x-ref 套件檔"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "鎖定的套件："
 
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(未找到)"
 
-#: cmdline/apt-cache.cc:1590
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
 msgstr "  已安裝："
 
-#: cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  候選："
 
-#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(無)"
 
-#: cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  套件鎖定："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
 
-#: cmdline/apt-cache.cc:1761
+#: cmdline/apt-cache.cc:1739
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -178,6 +179,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
+"   showauto - Display a list of automatically installed packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
@@ -310,12 +312,12 @@ msgstr ""
 "  -c=? 讀取指定的設定檔\n"
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "無法寫入 %s"
 
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
 
@@ -647,79 +649,79 @@ msgstr "在取消 %s 的連結時發生問題"
 msgid "Failed to rename %s to %s"
 msgstr "無法將 %s 更名為 %s"
 
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:134
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:156
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示式時發生錯誤 - %s"
 
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:251
 msgid "The following packages have unmet dependencies:"
 msgstr "下列的套件有未滿足的相依關係："
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
 msgstr "但 %s 卻已安裝"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但 %s 卻將被安裝"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:350
 msgid "but it is not installable"
 msgstr "但它卻無法安裝"
 
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:352
 msgid "but it is a virtual package"
 msgstr "但它是虛擬套件"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not installed"
 msgstr "但它卻尚未安裝"
 
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:355
 msgid "but it is not going to be installed"
 msgstr "但它卻將不會被安裝"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:360
 msgid " or"
 msgstr "或"
 
-#: cmdline/apt-get.cc:384
+#: cmdline/apt-get.cc:391
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】套件將會被安裝："
 
-#: cmdline/apt-get.cc:412
+#: cmdline/apt-get.cc:419
 msgid "The following packages will be REMOVED:"
 msgstr "下列套件將會被【移除】："
 
-#: cmdline/apt-get.cc:434
+#: cmdline/apt-get.cc:441
 msgid "The following packages have been kept back:"
 msgstr "下列套件將會維持其原有版本："
 
-#: cmdline/apt-get.cc:457
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "下列套件將會被升級："
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:487
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列套件將會被【降級】："
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:507
 msgid "The following held packages will be changed:"
 msgstr "下列被保留 (hold) 的套件將會被更改："
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,140 +729,232 @@ msgstr ""
 "【警告】：下列的基本套件都將被移除。\n"
 "除非您很清楚您在做什麼，否則請勿輕易嘗試！"
 
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "升級 %lu 個，新安裝 %lu 個，"
 
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安裝 %lu 個，"
 
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降級 %lu 個，"
 
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
 
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個沒有完整得安裝或移除。\n"
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "套件 %s 是虛擬套件，提供者為：\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr "【已安裝】"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "候選版本"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "請您明確地選擇一個來進行安裝。"
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"無法取得套件 %s，但它卻被其它的套件引用了。\n"
+"這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "然而，下列的套件取代了它："
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "套件 %s 沒有可安裝的候選版本"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "注意，選擇了以 %s 替代 %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "無法重新安裝 %s，因為它無法下載。\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 已經是最新版本了。\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s 被設定為手動安裝。\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+
+#: cmdline/apt-get.cc:934
 msgid "Correcting dependencies..."
 msgstr "正在修正相依關係..."
 
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:937
 msgid " failed."
 msgstr " 失敗。"
 
-#: cmdline/apt-get.cc:686
+#: cmdline/apt-get.cc:940
 msgid "Unable to correct dependencies"
 msgstr "無法修正相依關係"
 
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:943
 msgid "Unable to minimize the upgrade set"
 msgstr "無法將升級計劃最小化"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:945
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:695
+#: cmdline/apt-get.cc:949
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:952
 msgid "Unmet dependencies. Try using -f."
 msgstr "未能滿足相依關係。試試 -f 選項。"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:977
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：無法驗證下列套件！"
 
-#: cmdline/apt-get.cc:727
+#: cmdline/apt-get.cc:981
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了驗證警告。\n"
 
-#: cmdline/apt-get.cc:734
+#: cmdline/apt-get.cc:988
 msgid "Install these packages without verification [y/N]? "
 msgstr "是否不經驗證就安裝這些套件？[y/N]"
 
-#: cmdline/apt-get.cc:736
+#: cmdline/apt-get.cc:990
 msgid "Some packages could not be authenticated"
 msgstr "有部份套件無法驗證"
 
-#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
 msgid "There are problems and -y was used without --force-yes"
 msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:1040
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需要被移除，但卻被禁止移除。"
 
-#: cmdline/apt-get.cc:806
+#: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，排序未能完成"
 
-#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源列表。"
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1100
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:851
+#: cmdline/apt-get.cc:1105
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下載 %sB/%sB 的套件檔。\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:1108
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下載 %sB 的套件檔。\n"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n"
 
-#: cmdline/apt-get.cc:862
+#: cmdline/apt-get.cc:1116
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
 
-#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "無法確認 %s 的未使用空間"
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "在 %s 裡沒有足夠的的未使用空間。"
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。"
 
-#: cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1162
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:1164
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -871,28 +965,28 @@ msgstr ""
 "請輸入 '%s' 這個句子以繼續進行\n"
 " ?] "
 
-#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
 msgid "Abort."
 msgstr "放棄執行。"
 
-#: cmdline/apt-get.cc:931
+#: cmdline/apt-get.cc:1185
 msgid "Do you want to continue [Y/n]? "
 msgstr "是否繼續進行 [Y/n]？"
 
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法取得 %s，%s\n"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
 msgstr "有部份檔案無法下載"
 
-#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
 msgstr "下載完成，且這是『僅下載』模式"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1282
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -900,125 +994,57 @@ msgstr ""
 "有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選"
 "項？"
 
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1286
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前尚未支援 --fix-missing 和媒體抽換"
 
-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1291
 msgid "Unable to correct missing packages."
 msgstr "無法修正欠缺的套件。"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1292
 msgid "Aborting install."
 msgstr "放棄安裝。"
 
-#: cmdline/apt-get.cc:1096
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "注意，選擇了以 %s 替代 %s\n"
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
-
-#: cmdline/apt-get.cc:1117
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
-
-#: cmdline/apt-get.cc:1135
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
-
-#: cmdline/apt-get.cc:1146
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "套件 %s 是虛擬套件，提供者為：\n"
-
-#: cmdline/apt-get.cc:1159
-msgid " [Installed]"
-msgstr "【已安裝】"
-
-#: cmdline/apt-get.cc:1168
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "候選版本"
-
-#: cmdline/apt-get.cc:1170
-msgid "You should explicitly select one to install."
-msgstr "請您明確地選擇一個來進行安裝。"
-
-#: cmdline/apt-get.cc:1175
-#, c-format
+#: cmdline/apt-get.cc:1320
 msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"無法取得套件 %s，但它卻被其它的套件引用了。\n"
-"這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n"
-
-#: cmdline/apt-get.cc:1194
-msgid "However the following packages replace it:"
-msgstr "然而，下列的套件取代了它："
-
-#: cmdline/apt-get.cc:1197
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "套件 %s 沒有可安裝的候選版本"
-
-#: cmdline/apt-get.cc:1217
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "無法重新安裝 %s，因為它無法下載。\n"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已經是最新版本了。\n"
-
-#: cmdline/apt-get.cc:1254
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
-
-#: cmdline/apt-get.cc:1256
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "找不到 '%s' 版的 '%s'"
+"The following package 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] ""
 
-#: cmdline/apt-get.cc:1262
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+#: cmdline/apt-get.cc:1324
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr ""
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1486
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "無法取得來源套件列表 %s 的狀態"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
-#: cmdline/apt-get.cc:1514
+#: cmdline/apt-get.cc:1605
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
 
-#: cmdline/apt-get.cc:1562
+#: cmdline/apt-get.cc:1653
 #, fuzzy
 msgid ""
 "The following package is automatically installed and is no longer required:"
@@ -1028,7 +1054,7 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
 msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
-#: cmdline/apt-get.cc:1566
+#: cmdline/apt-get.cc:1657
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1036,11 +1062,11 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
 msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用 'apt-get autoremove' 來將其移除。"
 
-#: cmdline/apt-get.cc:1573
+#: 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."
@@ -1058,43 +1084,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
 msgstr "以下的資訊或許有助於解決當前的情況："
 
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處理失敗"
 
-#: cmdline/apt-get.cc:1599
+#: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤，AllUpgrade 造成了損壞"
 
-#: cmdline/apt-get.cc:1654
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "無法找到主題 %s"
-
-#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "無法找到套件 %s"
-
-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
-
-#: cmdline/apt-get.cc:1828
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s 被設定為手動安裝。\n"
-
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1779
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "您也許得執行 'apt-get -f install' 以修正這些問題："
 
-#: cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:1782
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1102,7 +1108,7 @@ msgstr ""
 "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
 "決方案）。"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1794
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1112,126 +1118,151 @@ msgstr ""
 "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
 "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1812
 msgid "Broken packages"
 msgstr "損毀的套件"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
 msgstr "下列的額外套件將被安裝："
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:1931
 msgid "Suggested packages:"
 msgstr "建議套件："
 
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1932
 msgid "Recommended packages:"
 msgstr "推薦套件："
 
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "無法找到套件 %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s 被設定為手動安裝。\n"
+
+#: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
 msgstr "籌備升級中... "
 
-#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2010
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，問題排除器造成了損壞"
 
-#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載目錄"
 
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
 msgstr "在取得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 的原始碼套件"
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2297
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已下載的檔案 '%s'\n"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2332
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "在 %s 裡沒有足夠的的未使用空間"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2341
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始套件檔。\n"
 
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "取得原始碼 %s\n"
 
-#: cmdline/apt-get.cc:2369
+#: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
 msgstr "無法取得某些套件檔。"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "不解開，因原始碼已解開至 %s\n"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2422
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "解開指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2423
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
-#: cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2440
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:2448
+#: cmdline/apt-get.cc:2460
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:2464
+#: cmdline/apt-get.cc:2476
 msgid "Must specify at least one package to check builddeps for"
 msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2506
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的編譯相依關係資訊"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2526
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 
-#: cmdline/apt-get.cc:2566
+#: cmdline/apt-get.cc:2577
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,30 +1270,30 @@ msgid ""
 msgstr ""
 "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:2666
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
 
-#: cmdline/apt-get.cc:2682
+#: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
 
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2709
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 的編譯相依關係。"
 
-#: cmdline/apt-get.cc:2703
+#: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
 msgstr "無法處理編譯相依關係"
 
-#: cmdline/apt-get.cc:2734
+#: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "已支援模組："
 
-#: cmdline/apt-get.cc:2775
+#: cmdline/apt-get.cc:2786
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1287,6 +1318,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1346,7 +1379,7 @@ msgstr ""
 "以取得更多資訊和選項。\n"
 "                        該 APT 有著超級牛力。\n"
 
-#: cmdline/apt-get.cc:2944
+#: cmdline/apt-get.cc:2958
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1591,9 +1624,9 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀取 %s"
@@ -1622,10 +1655,9 @@ msgstr "無法取得 %sinfo 的狀態"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "資料目錄與暫存目錄需位於同一檔案系統中"
 
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
-#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
-#: apt-pkg/pkgcachegen.cc:1181
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "正在讀取套件清單"
 
@@ -1756,12 +1788,12 @@ msgstr "找不到磁碟。"
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "無法取得狀態"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "無法設定修改時間"
 
@@ -1822,7 +1854,7 @@ msgstr "連線逾時"
 msgid "Server closed the connection"
 msgstr "伺服器已關閉連線"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
 msgid "Read error"
 msgstr "讀取錯誤"
 
@@ -1834,196 +1866,178 @@ msgstr "回應超過緩衝區長度。"
 msgid "Protocol corruption"
 msgstr "協定失敗"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
 msgid "Could not create a socket"
 msgstr "無法建立 Socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr "無法和 data socket 連線，連線逾時"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
 msgid "Could not connect passive socket."
 msgstr "無法和 passive socket 連線。"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 無法取得監聽 socket"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
 msgid "Could not bind a socket"
 msgstr "無法 bind 至 socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
 msgid "Could not listen on the socket"
 msgstr "無法監聽 socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
 msgid "Could not determine the socket's name"
 msgstr "無法解析 socket 名稱"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
 msgid "Unable to send PORT command"
 msgstr "無法送出 PORT 指令"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知的地址家族 %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
 msgid "Data socket connect timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
 msgid "Unable to accept connection"
 msgstr "無法接受連線"
 
-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "有問題的雜湊檔"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "無法取得檔案，伺服器回應 '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "資料傳輸失敗，伺服器回應 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
 msgid "Query"
 msgstr "查詢"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
 msgid "Unable to invoke "
 msgstr "無法 invoke "
 
-#: methods/connect.cc:70
+#: methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "正和 %s (%s) 連線"
 
-#: methods/connect.cc:81
+#: methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:90
+#: methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "無法建立 socket 指向 %s (f=%u t=%u p=%u)"
 
-#: methods/connect.cc:96
+#: methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "無法初始和 %s:%s (%s) 的連線。"
 
-#: methods/connect.cc:104
+#: methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "無法和 %s:%s (%s) 連線，連線逾時"
 
-#: methods/connect.cc:122
+#: methods/connect.cc:121
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "無法和 %s:%s (%s) 連線。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:150 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
 #, c-format
 msgid "Connecting to %s"
 msgstr "正連線至 %s"
 
-#: methods/connect.cc:169 methods/connect.cc:188
+#: methods/connect.cc:168 methods/connect.cc:187
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "無法解析 '%s'"
 
-#: methods/connect.cc:194
+#: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暫時無法解析 '%s'"
 
-#: methods/connect.cc:197
+#: methods/connect.cc:196
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 
-#: methods/connect.cc:244
+#: methods/connect.cc:243
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "無法連線至 %s %s："
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
+#: methods/gpgv.cc:71
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "放棄安裝。"
 
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。"
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
 
-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:172
+#, fuzzy
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 
-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
 msgstr "在執行 gpgv 時發生未知的錯誤"
 
-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
 msgid "The following signatures were invalid:\n"
 msgstr "以下簽名無效：\n"
 
-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:225
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "無法開啟管線給 %s 使用"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "由 %s 程序讀取錯誤"
-
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "等待標頭"
@@ -2085,19 +2099,19 @@ msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 msgid "Error reading from server"
 msgstr "在讀取伺服器時發生錯誤"
 
-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "無法截短檔案"
 
-#: methods/http.cc:1156
+#: methods/http.cc:1154
 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 
-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1171 methods/http.cc:1226
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1320
+#: methods/http.cc:1318
 msgid "Internal error"
 msgstr "內部錯誤"
 
@@ -2134,11 +2148,16 @@ msgstr ""
 "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
 "(man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2165,7 +2184,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1083
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "選項 %s 找不到"
@@ -2296,152 +2315,169 @@ msgstr "無法切換至 %s"
 msgid "Failed to stat the cdrom"
 msgstr "無法取得 CD-ROM 的狀態"
 
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "無法開啟鎖定檔 %s"
 
-#: apt-pkg/contrib/fileutl.cc:175
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "無法將 %s 鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:615
+#: apt-pkg/contrib/fileutl.cc:621
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待 %s 但是它並不存在"
 
-#: apt-pkg/contrib/fileutl.cc:627
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子程序 %s 收到一個記憶體錯誤。"
 
-#: apt-pkg/contrib/fileutl.cc:629
+#: apt-pkg/contrib/fileutl.cc:635
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子程序 %s 收到一個記憶體錯誤。"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:639
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子程序 %s 傳回錯誤碼 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:641
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子程序 %s 不預期得結束"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:697
 #, c-format
 msgid "Could not open file %s"
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/contrib/fileutl.cc:735
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "無法開啟管線給 %s 使用"
+
+#: apt-pkg/contrib/fileutl.cc:774
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "讀取，仍有 %lu 未讀但已無空間"
 
-#: apt-pkg/contrib/fileutl.cc:765
+#: apt-pkg/contrib/fileutl.cc:807
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
 
-#: apt-pkg/contrib/fileutl.cc:840
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "在關閉檔案時發生問題"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
 msgstr "在關閉檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:846
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "在同步檔案時發生問題"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
 msgstr "在刪除檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:857
+#: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
 msgstr "在同步檔案時發生問題"
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
 msgstr "清空套件快取"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "The package cache file is corrupted"
 msgstr "套件快取檔損壞"
 
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:153
 msgid "The package cache file is an incompatible version"
 msgstr "套件快取檔版本不符"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:158
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本 APT 不支援 '%s' 版本系統"
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:163
 msgid "The package cache was built for a different architecture"
 msgstr "這個套件快取是用於另一種平台的"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Depends"
 msgstr "相依關係"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "PreDepends"
 msgstr "預先相依關係"
 
-#: apt-pkg/pkgcache.cc:287
+#: apt-pkg/pkgcache.cc:290
 msgid "Suggests"
 msgstr "建議"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Recommends"
 msgstr "推薦"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
 msgstr "衝突"
 
-#: apt-pkg/pkgcache.cc:288
+#: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
 msgstr "取代"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Obsoletes"
 msgstr "廢棄"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Breaks"
 msgstr "毀損"
 
-#: apt-pkg/pkgcache.cc:289
+#: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:303
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "optional"
 msgstr "次要"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:304
 msgid "extra"
 msgstr "額外"
 
@@ -2471,7 +2507,7 @@ msgstr "無法開啟 StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "無法寫入暫存的 StateFile %s"
 
-#: apt-pkg/depcache.cc:851
+#: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2556,7 +2592,7 @@ msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
 
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2603,7 +2639,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 
-#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2651,12 +2687,12 @@ msgstr "安裝方式 %s 沒有正確啟動"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支援的套件包裝系統 '%s'"
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:157
 msgid "Unable to determine a suitable packaging system type"
 msgstr "無法確認合適的套件包裝系統類型"
 
@@ -2669,139 +2705,161 @@ msgstr "無法取得 %s 的狀態。"
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "在 sources.list 中必須包含一些 'source' URI"
 
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "無法分析或開啟套件清單或狀況檔。"
 
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您也許得執行 apt-get update 以修正這些問題"
 
-#: apt-pkg/policy.cc:333
+#: apt-pkg/policy.cc:343
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭"
 
-#: apt-pkg/policy.cc:355
+#: apt-pkg/policy.cc:365
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "無法分析鎖定類型 %s"
 
-#: apt-pkg/policy.cc:363
+#: apt-pkg/policy.cc:373
 msgid "No priority (or zero) specified for pin"
 msgstr "銷定並沒有優先順序之分（或零）"
 
-#: apt-pkg/pkgcachegen.cc:75
+#: apt-pkg/pkgcachegen.cc:80
 msgid "Cache has an incompatible versioning system"
 msgstr "快取使用的是不相容的版本系統"
 
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:198
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "在處理 %s 時發生錯誤 (NewPackage)"
 
-#: apt-pkg/pkgcachegen.cc:146
+#: apt-pkg/pkgcachegen.cc:215
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "在處理 %s 時發生錯誤 (UsePackage1)"
 
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:253
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "在處理 %s 時發生錯誤 (NewFileDesc1)"
 
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:285
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "在處理 %s 時發生錯誤 (UsePackage2)"
 
-#: apt-pkg/pkgcachegen.cc:214
+#: apt-pkg/pkgcachegen.cc:289
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "在處理 %s 時發生錯誤 (NewFileVer1)"
 
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "在處理 %s 時發生錯誤 (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "在處理 %s 時發生錯誤 (UsePackage3)"
 
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "在處理 %s 時發生錯誤 (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:353
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "在處理 %s 時發生錯誤 (NewFileDesc2)"
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:360
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
 
-#: apt-pkg/pkgcachegen.cc:276
+#: apt-pkg/pkgcachegen.cc:363
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
 
-#: apt-pkg/pkgcachegen.cc:279
+#: apt-pkg/pkgcachegen.cc:366
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
 
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:369
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
 
-#: apt-pkg/pkgcachegen.cc:310
+#: apt-pkg/pkgcachegen.cc:398
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "在處理 %s 時發生錯誤 (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:323
+#: apt-pkg/pkgcachegen.cc:412
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)"
 
-#: apt-pkg/pkgcachegen.cc:329
+#: apt-pkg/pkgcachegen.cc:418
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "在計算檔案相依性時找不到套件 %s %s"
 
-#: apt-pkg/pkgcachegen.cc:860
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "無法取得來源套件列表 %s 的狀態"
 
-#: apt-pkg/pkgcachegen.cc:962
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "正在收集檔案提供者"
 
-#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "在儲存來源快取時 IO 錯誤"
 
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "無法重新命名，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum 不符"
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
 
-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, fuzzy, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr "Release 檔已過期，略過 %s（有效期限 %s）"
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
+
+#: apt-pkg/acquire-item.cc:1324
+#, c-format
+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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2810,38 +2868,48 @@ msgstr ""
 "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
 "台）"
 
-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。"
 
-#: apt-pkg/acquire-item.cc:1374
+#: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
 
-#: apt-pkg/acquire-item.cc:1461
+#: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "無法辨別 Release 檔 %s"
 
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有區段"
 
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2894,8 +2962,8 @@ msgstr "正在掃描碟片中的索引檔..\n"
 #: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n"
 
 #: apt-pkg/cdrom.cc:677
@@ -2934,143 +3002,182 @@ msgstr "正在寫入新的來源列表\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "寫入 %i 筆紀錄。\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n"
 
-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "開啟設定檔 %s"
 
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:544
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
 msgstr "正在安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
 #, c-format
 msgid "Configuring %s"
 msgstr "正在設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
 #, c-format
 msgid "Removing %s"
 msgstr "正在移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:55
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "正在執行安裝後套件後續處理程式 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
 msgid "Preparing %s"
 msgstr "正在準備 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:813
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解開 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:736
+#: apt-pkg/deb/dpkgpm.cc:818
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在準備設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:820
 #, c-format
 msgid "Installed %s"
 msgstr "已安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:743
+#: apt-pkg/deb/dpkgpm.cc:825
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在準備移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:745
+#: apt-pkg/deb/dpkgpm.cc:827
 #, c-format
 msgid "Removed %s"
 msgstr "已移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:750
+#: apt-pkg/deb/dpkgpm.cc:832
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在準備完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:751
+#: apt-pkg/deb/dpkgpm.cc:833
 #, c-format
 msgid "Completely removed %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:955
+#: apt-pkg/deb/dpkgpm.cc:1039
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+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."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "無法鎖定列表目錄"
 
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
 msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
 msgstr ""
 
@@ -3088,10 +3195,31 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "連線突然終止"
 
+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "找不到 '%s' 版的 '%s'"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "無法找到主題 %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "無法開啟管線給 %s 使用"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "由 %s 程序讀取錯誤"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewVersion2)"
+
 #~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）"
 
@@ -3109,9 +3237,3 @@ msgstr "連線突然終止"
 
 #~ msgid "Processing triggers for %s"
 #~ msgstr "正在進行 %s 的觸發程式"
-
-#~ msgid "Release file expired, ignoring %s (valid until %s)"
-#~ msgstr "Release 檔已過期，略過 %s（有效期限 %s）"
-
-#~ msgid "Conflicting distribution: %s (expected %s but got %s)"
-#~ msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
-- 
2.45.2